# Created by: Erwin Lansing <erwin@FreeBSD.org>
# $FreeBSD$

PORTNAME=	Test-Inline
PORTVERSION=	2.213
PORTREVISION=	1
CATEGORIES=	devel perl5
MASTER_SITES=	CPAN
PKGNAMEPREFIX=	p5-

MAINTAINER=	perl@FreeBSD.org
COMMENT=	Inlining your tests next to the code being tested

LICENSE=	ART10 GPLv1
LICENSE_COMB=	dual

RUN_DEPENDS=	p5-Algorithm-Dependency>=1.02:${PORTSDIR}/devel/p5-Algorithm-Dependency \
		p5-Class-Autouse>=1.15:${PORTSDIR}/devel/p5-Class-Autouse \
		p5-Config-Tiny>=2.00:${PORTSDIR}/devel/p5-Config-Tiny \
		p5-File-Find-Rule>=0.26:${PORTSDIR}/devel/p5-File-Find-Rule \
		p5-File-Flat>=1.00:${PORTSDIR}/devel/p5-File-Flat \
		p5-File-Remove>=0.37:${PORTSDIR}/devel/p5-File-Remove \
		p5-File-Slurp>=9999.04:${PORTSDIR}/devel/p5-File-Slurp \
		p5-File-chmod>=0.31:${PORTSDIR}/devel/p5-File-chmod \
		p5-Params-Util>=0.21:${PORTSDIR}/devel/p5-Params-Util \
		p5-Pod-Tests>=0.18:${PORTSDIR}/devel/p5-Pod-Tests
BUILD_DEPENDS:=	${RUN_DEPENDS}
BUILD_DEPENDS+=	p5-Test-ClassAPI>=1.02:${PORTSDIR}/devel/p5-Test-ClassAPI \
		p5-Test-Script>=1.02:${PORTSDIR}/devel/p5-Test-Script

USES=		perl5
USE_PERL5=	configure

.include <bsd.port.mk>
ge='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=WITH_LIBEFS'>about</a><a href='/~lantw44/cgit/gsoc2013-evolution/?h=WITH_LIBEFS'>summary</a><a href='/~lantw44/cgit/gsoc2013-evolution/refs/?h=WITH_LIBEFS'>refs</a><a href='/~lantw44/cgit/gsoc2013-evolution/log/?h=WITH_LIBEFS'>log</a><a href='/~lantw44/cgit/gsoc2013-evolution/tree/?h=WITH_LIBEFS'>tree</a><a href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=WITH_LIBEFS'>commit</a><a class='active' href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=WITH_LIBEFS'>diff</a><a href='/~lantw44/cgit/gsoc2013-evolution/stats/?h=WITH_LIBEFS'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/gsoc2013-evolution/log/'>
<input type='hidden' name='h' value='WITH_LIBEFS'/><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='WITH_LIBEFS'/><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><div class='diffstat-header'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=WITH_LIBEFS'>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=WITH_LIBEFS'>.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/AUTHORS?h=WITH_LIBEFS'>AUTHORS</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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: 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/ChangeLog?h=WITH_LIBEFS'>ChangeLog</a></td><td class='right'>4883</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 27.5%;'/><td class='none' style='width: 72.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/HACKING?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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: 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/MAINTAINERS?h=WITH_LIBEFS'>MAINTAINERS</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/Makefile.am?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/NEWS?h=WITH_LIBEFS'>NEWS</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/README?h=WITH_LIBEFS'>README</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: 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/acconfig.h?h=WITH_LIBEFS'>acconfig.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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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=WITH_LIBEFS'>addressbook/ChangeLog</a></td><td class='right'>1194</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/addressbook/Makefile.am?h=WITH_LIBEFS'>addressbook/Makefile.am</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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>addressbook/backend/ebook/.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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>addressbook/backend/ebook/Makefile.am</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.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/TODO?h=WITH_LIBEFS'>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=WITH_LIBEFS'>addressbook/backend/ebook/e-book-listener.c</a></td><td class='right'>587</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/addressbook/backend/ebook/e-book-listener.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book-listener.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.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-book-types.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book-types.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>addressbook/backend/ebook/e-book-view-listener.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: 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/backend/ebook/e-book-view-listener.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book-view-listener.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.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-book-view.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book-view.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: 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/addressbook/backend/ebook/e-book-view.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book-view.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.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.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book.c</a></td><td class='right'>1010</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/addressbook/backend/ebook/e-book.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-book.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.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/ebook/e-card-cursor.c?h=WITH_LIBEFS'>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: 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/backend/ebook/e-card-cursor.h?h=WITH_LIBEFS'>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.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-iterator.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-iterator.c</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: 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/addressbook/backend/ebook/e-card-iterator.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-iterator.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.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-list-iterator.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-list-iterator.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: 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-card-list-iterator.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-list-iterator.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.2%;'/><td class='none' style='width: 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-list.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-list.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.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-card-list.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-list.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.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-pairs.h?h=WITH_LIBEFS'>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.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/ebook/e-card-simple.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-simple.c</a></td><td class='right'>1185</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/addressbook/backend/ebook/e-card-simple.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-simple.h</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: 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-card-types.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card-types.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.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.c?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card.c</a></td><td class='right'>3248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.3%;'/><td class='none' style='width: 81.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.h?h=WITH_LIBEFS'>addressbook/backend/ebook/e-card.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.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/load-pine-addressbook.c?h=WITH_LIBEFS'>addressbook/backend/ebook/load-pine-addressbook.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.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/test-card.c?h=WITH_LIBEFS'>addressbook/backend/ebook/test-card.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: 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/test-client-list.c?h=WITH_LIBEFS'>addressbook/backend/ebook/test-client-list.c</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.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.c?h=WITH_LIBEFS'>addressbook/backend/ebook/test-client.c</a></td><td class='right'>190</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/idl/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>addressbook/backend/idl/addressbook.idl</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.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/.cvsignore?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>addressbook/backend/pas/Makefile.am</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.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/pas/TODO?h=WITH_LIBEFS'>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/pas-backend-file.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-backend-file.c</a></td><td class='right'>1244</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/addressbook/backend/pas/pas-backend-file.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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-backend-ldap.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-backend-ldap.c</a></td><td class='right'>1097</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/addressbook/backend/pas/pas-backend-ldap.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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-backend.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-backend.c</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.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/backend/pas/pas-backend.h?h=WITH_LIBEFS'>addressbook/backend/pas/pas-backend.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.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-book-factory.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-book-factory.c</a></td><td class='right'>639</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/addressbook/backend/pas/pas-book-factory.h?h=WITH_LIBEFS'>addressbook/backend/pas/pas-book-factory.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.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/pas/pas-book-view.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-book-view.c</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: 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/pas/pas-book-view.h?h=WITH_LIBEFS'>addressbook/backend/pas/pas-book-view.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.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/pas/pas-book.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-book.c</a></td><td class='right'>677</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/addressbook/backend/pas/pas-book.h?h=WITH_LIBEFS'>addressbook/backend/pas/pas-book.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.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/pas/pas-card-cursor.c?h=WITH_LIBEFS'>addressbook/backend/pas/pas-card-cursor.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: 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/backend/pas/pas-card-cursor.h?h=WITH_LIBEFS'>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.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/contact-editor/.cvsignore?h=WITH_LIBEFS'>addressbook/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/contact-editor/Makefile.am?h=WITH_LIBEFS'>addressbook/contact-editor/Makefile.am</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.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/contact-editor/arrow.png?h=WITH_LIBEFS'>addressbook/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/contact-editor/briefcase.png?h=WITH_LIBEFS'>addressbook/contact-editor/briefcase.png</a></td><td class='right'>bin</td><td class='graph'>390 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/categories-strings.h?h=WITH_LIBEFS'>addressbook/contact-editor/categories-strings.h</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.1%;'/><td class='none' style='width: 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/contact-editor/categories.glade?h=WITH_LIBEFS'>addressbook/contact-editor/categories.glade</a></td><td class='right'>190</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/contact-editor/contact-editor.glade?h=WITH_LIBEFS'>addressbook/contact-editor/contact-editor.glade</a></td><td class='right'>2331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.1%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/e-contact-editor-categories.c?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-editor-categories.c</a></td><td class='right'>456</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/contact-editor/e-contact-editor-categories.h?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-editor-categories.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.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/contact-editor/e-contact-editor-fullname.c?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-editor-fullname.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: 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/contact-editor/e-contact-editor-fullname.h?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-editor-fullname.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.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/contact-editor/e-contact-editor-strings.h?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-editor-strings.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.2%;'/><td class='none' style='width: 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/contact-editor/e-contact-editor.c?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-editor.c</a></td><td class='right'>1701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.6%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/e-contact-editor.h?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-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.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/contact-editor/e-contact-save-as.c?h=WITH_LIBEFS'>addressbook/contact-editor/e-contact-save-as.c</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.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/contact-editor/e-contact-save-as.h?h=WITH_LIBEFS'>addressbook/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.2%;'/><td class='none' style='width: 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/contact-editor/email.png?h=WITH_LIBEFS'>addressbook/contact-editor/email.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/addressbook/contact-editor/fullname-strings.h?h=WITH_LIBEFS'>addressbook/contact-editor/fullname-strings.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/addressbook/contact-editor/fullname.glade?h=WITH_LIBEFS'>addressbook/contact-editor/fullname.glade</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: 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/contact-editor/head.png?h=WITH_LIBEFS'>addressbook/contact-editor/head.png</a></td><td class='right'>bin</td><td class='graph'>493 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/netfreebusy.png?h=WITH_LIBEFS'>addressbook/contact-editor/netfreebusy.png</a></td><td class='right'>bin</td><td class='graph'>755 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/netmeeting.png?h=WITH_LIBEFS'>addressbook/contact-editor/netmeeting.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/addressbook/contact-editor/phone.png?h=WITH_LIBEFS'>addressbook/contact-editor/phone.png</a></td><td class='right'>bin</td><td class='graph'>506 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/snailmail.png?h=WITH_LIBEFS'>addressbook/contact-editor/snailmail.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/addressbook/contact-editor/test-editor.c?h=WITH_LIBEFS'>addressbook/contact-editor/test-editor.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.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/contact-editor/web.png?h=WITH_LIBEFS'>addressbook/contact-editor/web.png</a></td><td class='right'>bin</td><td class='graph'>573 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/demo/.cvsignore?h=WITH_LIBEFS'>addressbook/demo/.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/demo/Makefile.am?h=WITH_LIBEFS'>addressbook/demo/Makefile.am</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.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/demo/addressbook-factory.c?h=WITH_LIBEFS'>addressbook/demo/addressbook-factory.c</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.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/demo/addressbook-widget.c?h=WITH_LIBEFS'>addressbook/demo/addressbook-widget.c</a></td><td class='right'>537</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/demo/addressbook-widget.h?h=WITH_LIBEFS'>addressbook/demo/addressbook-widget.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.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/demo/addressbook.c?h=WITH_LIBEFS'>addressbook/demo/addressbook.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: 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/demo/addressbook.gnorba?h=WITH_LIBEFS'>addressbook/demo/addressbook.gnorba</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.1%;'/><td class='none' style='width: 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/demo/addressbook.h?h=WITH_LIBEFS'>addressbook/demo/addressbook.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/demo/demo.c?h=WITH_LIBEFS'>addressbook/demo/demo.c</a></td><td class='right'>466</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/demo/e-test-model.c?h=WITH_LIBEFS'>addressbook/demo/e-test-model.c</a></td><td class='right'>385</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/demo/e-test-model.h?h=WITH_LIBEFS'>addressbook/demo/e-test-model.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.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/demo/spec?h=WITH_LIBEFS'>addressbook/demo/spec</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.1%;'/><td class='none' style='width: 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/ename/.cvsignore?h=WITH_LIBEFS'>addressbook/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/addressbook/ename/Makefile.am?h=WITH_LIBEFS'>addressbook/ename/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.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/ename/TODO?h=WITH_LIBEFS'>addressbook/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/addressbook/ename/e-name-western-tables.h?h=WITH_LIBEFS'>addressbook/ename/e-name-western-tables.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.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/ename/e-name-western.c?h=WITH_LIBEFS'>addressbook/ename/e-name-western.c</a></td><td class='right'>868</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/addressbook/ename/e-name-western.h?h=WITH_LIBEFS'>addressbook/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.1%;'/><td class='none' style='width: 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/ename/test-ename-western-gtk.c?h=WITH_LIBEFS'>addressbook/ename/test-ename-western-gtk.c</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.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/ename/test-ename-western.c?h=WITH_LIBEFS'>addressbook/ename/test-ename-western.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.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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>addressbook/gui/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.1%;'/><td class='none' style='width: 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/GNOME_Evolution_Addressbook.oaf.in?h=WITH_LIBEFS'>addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in</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.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/GNOME_Evolution_Addressbook.oafinfo?h=WITH_LIBEFS'>addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo</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.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/Makefile.am?h=WITH_LIBEFS'>addressbook/gui/component/Makefile.am</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.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/addressbook-component.c?h=WITH_LIBEFS'>addressbook/gui/component/addressbook-component.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.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/gui/component/addressbook-component.h?h=WITH_LIBEFS'>addressbook/gui/component/addressbook-component.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.2%;'/><td class='none' style='width: 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-factory.c?h=WITH_LIBEFS'>addressbook/gui/component/addressbook-factory.c</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.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/addressbook.c?h=WITH_LIBEFS'>addressbook/gui/component/addressbook.c</a></td><td class='right'>1144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.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.gnorba?h=WITH_LIBEFS'>addressbook/gui/component/addressbook.gnorba</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/component/addressbook.h?h=WITH_LIBEFS'>addressbook/gui/component/addressbook.h</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.1%;'/><td class='none' style='width: 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.oafinfo?h=WITH_LIBEFS'>addressbook/gui/component/addressbook.oafinfo</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.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/alphabet.glade?h=WITH_LIBEFS'>addressbook/gui/component/alphabet.glade</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: 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/addressbook/gui/component/alphabet.glade.h?h=WITH_LIBEFS'>addressbook/gui/component/alphabet.glade.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.2%;'/><td class='none' style='width: 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-addressbook-model.c?h=WITH_LIBEFS'>addressbook/gui/component/e-addressbook-model.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: 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/e-addressbook-model.h?h=WITH_LIBEFS'>addressbook/gui/component/e-addressbook-model.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.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/e-cardlist-model.c?h=WITH_LIBEFS'>addressbook/gui/component/e-cardlist-model.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: 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/e-cardlist-model.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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-ldap-server-dialog.c?h=WITH_LIBEFS'>addressbook/gui/component/e-ldap-server-dialog.c</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.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/gui/component/e-ldap-server-dialog.h?h=WITH_LIBEFS'>addressbook/gui/component/e-ldap-server-dialog.h</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.1%;'/><td class='none' style='width: 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/e-select-names.c?h=WITH_LIBEFS'>addressbook/gui/component/e-select-names.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: 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/gui/component/e-select-names.h?h=WITH_LIBEFS'>addressbook/gui/component/e-select-names.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.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/ldap-server-dialog.glade?h=WITH_LIBEFS'>addressbook/gui/component/ldap-server-dialog.glade</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: 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/addressbook/gui/component/ldap-server-dialog.glade.h?h=WITH_LIBEFS'>addressbook/gui/component/ldap-server-dialog.glade.h</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.1%;'/><td class='none' style='width: 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.glade?h=WITH_LIBEFS'>addressbook/gui/component/select-names.glade</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: 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/select-names.glade.h?h=WITH_LIBEFS'>addressbook/gui/component/select-names.glade.h</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.1%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>addressbook/gui/contact-editor/Makefile.am</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.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/arrow.png?h=WITH_LIBEFS'>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/briefcase.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/briefcase.png</a></td><td class='right'>bin</td><td class='graph'>390 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/categories-strings.h?h=WITH_LIBEFS'>addressbook/gui/contact-editor/categories-strings.h</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.1%;'/><td class='none' style='width: 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/categories.glade?h=WITH_LIBEFS'>addressbook/gui/contact-editor/categories.glade</a></td><td class='right'>190</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/contact-editor.glade?h=WITH_LIBEFS'>addressbook/gui/contact-editor/contact-editor.glade</a></td><td class='right'>2331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.1%;'/><td class='none' style='width: 86.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-editor-categories.c?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-editor-categories.c</a></td><td class='right'>456</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/contact-editor/e-contact-editor-categories.h?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-editor-categories.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.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-editor-fullname.c?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-editor-fullname.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: 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/contact-editor/e-contact-editor-fullname.h?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-editor-fullname.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.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/contact-editor/e-contact-editor-strings.h?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-editor-strings.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-editor.c</a></td><td class='right'>1701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.6%;'/><td class='none' style='width: 90.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.h?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-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.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-save-as.c?h=WITH_LIBEFS'>addressbook/gui/contact-editor/e-contact-save-as.c</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.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/contact-editor/e-contact-save-as.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/email.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/email.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/addressbook/gui/contact-editor/fullname-strings.h?h=WITH_LIBEFS'>addressbook/gui/contact-editor/fullname-strings.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/addressbook/gui/contact-editor/fullname.glade?h=WITH_LIBEFS'>addressbook/gui/contact-editor/fullname.glade</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: 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/gui/contact-editor/head.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/head.png</a></td><td class='right'>bin</td><td class='graph'>493 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/netfreebusy.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/netfreebusy.png</a></td><td class='right'>bin</td><td class='graph'>755 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/netmeeting.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/netmeeting.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/addressbook/gui/contact-editor/phone.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/phone.png</a></td><td class='right'>bin</td><td class='graph'>506 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/snailmail.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/snailmail.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/addressbook/gui/contact-editor/test-editor.c?h=WITH_LIBEFS'>addressbook/gui/contact-editor/test-editor.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.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/contact-editor/web.png?h=WITH_LIBEFS'>addressbook/gui/contact-editor/web.png</a></td><td class='right'>bin</td><td class='graph'>573 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/minicard/.cvsignore?h=WITH_LIBEFS'>addressbook/gui/minicard/.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.1%;'/><td class='none' style='width: 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/minicard/Makefile.am?h=WITH_LIBEFS'>addressbook/gui/minicard/Makefile.am</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.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/minicard/e-minicard-label.c?h=WITH_LIBEFS'>addressbook/gui/minicard/e-minicard-label.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: 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/addressbook/gui/minicard/e-minicard-label.h?h=WITH_LIBEFS'>addressbook/gui/minicard/e-minicard-label.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.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/minicard/e-minicard-view.c?h=WITH_LIBEFS'>addressbook/gui/minicard/e-minicard-view.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: 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/addressbook/gui/minicard/e-minicard-view.h?h=WITH_LIBEFS'>addressbook/gui/minicard/e-minicard-view.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.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/minicard/e-minicard.c?h=WITH_LIBEFS'>addressbook/gui/minicard/e-minicard.c</a></td><td class='right'>728</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/addressbook/gui/minicard/e-minicard.h?h=WITH_LIBEFS'>addressbook/gui/minicard/e-minicard.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.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/minicard/e-reflow-sorted.c?h=WITH_LIBEFS'>addressbook/gui/minicard/e-reflow-sorted.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: 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/minicard/e-reflow-sorted.h?h=WITH_LIBEFS'>addressbook/gui/minicard/e-reflow-sorted.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.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/minicard/e-reflow.c?h=WITH_LIBEFS'>addressbook/gui/minicard/e-reflow.c</a></td><td class='right'>848</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/addressbook/gui/minicard/e-reflow.h?h=WITH_LIBEFS'>addressbook/gui/minicard/e-reflow.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.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/minicard/test-minicard-label.c?h=WITH_LIBEFS'>addressbook/gui/minicard/test-minicard-label.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.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/gui/minicard/test-minicard-view.c?h=WITH_LIBEFS'>addressbook/gui/minicard/test-minicard-view.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: 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/minicard/test-minicard.c?h=WITH_LIBEFS'>addressbook/gui/minicard/test-minicard.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.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/minicard/test-reflow.c?h=WITH_LIBEFS'>addressbook/gui/minicard/test-reflow.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: 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/Makefile.am?h=WITH_LIBEFS'>addressbook/gui/widgets/Makefile.am</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.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/alphabet.glade?h=WITH_LIBEFS'>addressbook/gui/widgets/alphabet.glade</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: 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/addressbook/gui/widgets/alphabet.glade.h?h=WITH_LIBEFS'>addressbook/gui/widgets/alphabet.glade.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.2%;'/><td class='none' style='width: 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-model.c?h=WITH_LIBEFS'>addressbook/gui/widgets/e-addressbook-model.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: 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/widgets/e-addressbook-model.h?h=WITH_LIBEFS'>addressbook/gui/widgets/e-addressbook-model.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.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-label.c?h=WITH_LIBEFS'>addressbook/gui/widgets/e-minicard-label.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: 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/addressbook/gui/widgets/e-minicard-label.h?h=WITH_LIBEFS'>addressbook/gui/widgets/e-minicard-label.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.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/e-minicard-view.c?h=WITH_LIBEFS'>addressbook/gui/widgets/e-minicard-view.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: 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/addressbook/gui/widgets/e-minicard-view.h?h=WITH_LIBEFS'>addressbook/gui/widgets/e-minicard-view.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.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/e-minicard.c?h=WITH_LIBEFS'>addressbook/gui/widgets/e-minicard.c</a></td><td class='right'>728</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/addressbook/gui/widgets/e-minicard.h?h=WITH_LIBEFS'>addressbook/gui/widgets/e-minicard.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.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/test-minicard-label.c?h=WITH_LIBEFS'>addressbook/gui/widgets/test-minicard-label.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.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/gui/widgets/test-minicard-view.c?h=WITH_LIBEFS'>addressbook/gui/widgets/test-minicard-view.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: 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/widgets/test-minicard.c?h=WITH_LIBEFS'>addressbook/gui/widgets/test-minicard.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.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/test-reflow.c?h=WITH_LIBEFS'>addressbook/gui/widgets/test-reflow.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: 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/printing/.cvsignore?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>addressbook/printing/Makefile.am</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.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/printing/e-contact-print-style-editor.c?h=WITH_LIBEFS'>addressbook/printing/e-contact-print-style-editor.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.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/printing/e-contact-print-style-editor.h?h=WITH_LIBEFS'>addressbook/printing/e-contact-print-style-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.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/printing/e-contact-print-types.h?h=WITH_LIBEFS'>addressbook/printing/e-contact-print-types.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.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/printing/e-contact-print.c?h=WITH_LIBEFS'>addressbook/printing/e-contact-print.c</a></td><td class='right'>1067</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/addressbook/printing/e-contact-print.glade?h=WITH_LIBEFS'>addressbook/printing/e-contact-print.glade</a></td><td class='right'>2009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.3%;'/><td class='none' style='width: 88.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.glade.h?h=WITH_LIBEFS'>addressbook/printing/e-contact-print.glade.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.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.h?h=WITH_LIBEFS'>addressbook/printing/e-contact-print.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.2%;'/><td class='none' style='width: 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/medbook.ecps?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/phonelist.ecps?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/smallbook.ecps?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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-contact-print-style-editor.c?h=WITH_LIBEFS'>addressbook/printing/test-contact-print-style-editor.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.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/test-print.c?h=WITH_LIBEFS'>addressbook/printing/test-print.c</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.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/art/.cvsignore?h=WITH_LIBEFS'>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/Makefile.am?h=WITH_LIBEFS'>art/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.2%;'/><td class='none' style='width: 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/attachment.xpm?h=WITH_LIBEFS'>art/attachment.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.1%;'/><td class='none' style='width: 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/briefcase.png?h=WITH_LIBEFS'>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/cellphone.png?h=WITH_LIBEFS'>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/empty.xpm?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/envelope.png?h=WITH_LIBEFS'>art/envelope.png</a></td><td class='right'>bin</td><td class='graph'>3168 -> 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=WITH_LIBEFS'>art/evolution-calendar-mini.png</a></td><td class='right'>bin</td><td class='graph'>491 -> 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=WITH_LIBEFS'>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=WITH_LIBEFS'>art/evolution-contacts-mini.png</a></td><td class='right'>bin</td><td class='graph'>533 -> 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=WITH_LIBEFS'>art/evolution-contacts.png</a></td><td class='right'>bin</td><td class='graph'>3947 -> 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=WITH_LIBEFS'>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=WITH_LIBEFS'>art/evolution-inbox.png</a></td><td class='right'>bin</td><td class='graph'>4281 -> 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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>art/evolution-tasks.png</a></td><td class='right'>bin</td><td class='graph'>3515 -> 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=WITH_LIBEFS'>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/globe.png?h=WITH_LIBEFS'>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/house.png?h=WITH_LIBEFS'>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/mail-new.xpm?h=WITH_LIBEFS'>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.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/mail-read.xpm?h=WITH_LIBEFS'>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.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/mail-replied.xpm?h=WITH_LIBEFS'>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.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/malehead.png?h=WITH_LIBEFS'>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.xpm?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/meeting.xpm?h=WITH_LIBEFS'>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.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/priority-high.xpm?h=WITH_LIBEFS'>art/priority-high.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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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.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=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>calendar/.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.1%;'/><td class='none' style='width: 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/AUTHORS?h=WITH_LIBEFS'>calendar/AUTHORS</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/calendar/ChangeLog?h=WITH_LIBEFS'>calendar/ChangeLog</a></td><td class='right'>4571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 25.8%;'/><td class='none' style='width: 74.2%;'/></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=WITH_LIBEFS'>calendar/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/TODO?h=WITH_LIBEFS'>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.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-client/.cvsignore?h=WITH_LIBEFS'>calendar/cal-client/.cvsignore</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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>calendar/cal-client/Makefile.am</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.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-client.c?h=WITH_LIBEFS'>calendar/cal-client/cal-client.c</a></td><td class='right'>1064</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/calendar/cal-client/cal-client.h?h=WITH_LIBEFS'>calendar/cal-client/cal-client.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.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/cal-listener.c?h=WITH_LIBEFS'>calendar/cal-client/cal-listener.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: 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/cal-client/cal-listener.h?h=WITH_LIBEFS'>calendar/cal-client/cal-listener.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.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/client-test.c?h=WITH_LIBEFS'>calendar/cal-client/client-test.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: 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/cal-util/.cvsignore?h=WITH_LIBEFS'>calendar/cal-util/.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/cal-util/Makefile.am?h=WITH_LIBEFS'>calendar/cal-util/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.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/cal-util/cal-recur.c?h=WITH_LIBEFS'>calendar/cal-util/cal-recur.c</a></td><td class='right'>2811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.8%;'/><td class='none' style='width: 84.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-util/cal-recur.h?h=WITH_LIBEFS'>calendar/cal-util/cal-recur.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.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/cal-util.c?h=WITH_LIBEFS'>calendar/cal-util/cal-util.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.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-util/cal-util.h?h=WITH_LIBEFS'>calendar/cal-util/cal-util.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.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-util/calobj.c?h=WITH_LIBEFS'>calendar/cal-util/calobj.c</a></td><td class='right'>1998</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.3%;'/><td class='none' style='width: 88.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/calobj.h?h=WITH_LIBEFS'>calendar/cal-util/calobj.h</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: 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/cal-util/icalendar-save.c?h=WITH_LIBEFS'>calendar/cal-util/icalendar-save.c</a></td><td class='right'>516</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/cal-util/icalendar-save.h?h=WITH_LIBEFS'>calendar/cal-util/icalendar-save.h</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.1%;'/><td class='none' style='width: 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/icalendar-test.c?h=WITH_LIBEFS'>calendar/cal-util/icalendar-test.c</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.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-util/icalendar.c?h=WITH_LIBEFS'>calendar/cal-util/icalendar.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: 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/calendar/cal-util/icalendar.h?h=WITH_LIBEFS'>calendar/cal-util/icalendar.h</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.1%;'/><td class='none' style='width: 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/test-recur.c?h=WITH_LIBEFS'>calendar/cal-util/test-recur.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: 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/cal-util/timeutil.c?h=WITH_LIBEFS'>calendar/cal-util/timeutil.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: 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/cal-util/timeutil.h?h=WITH_LIBEFS'>calendar/cal-util/timeutil.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.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/conduits/calendar/calendar-conduit-control-applet.c?h=WITH_LIBEFS'>calendar/conduits/calendar/calendar-conduit-control-applet.c</a></td><td class='right'>360</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/conduits/calendar/calendar-conduit-control-applet.desktop?h=WITH_LIBEFS'>calendar/conduits/calendar/calendar-conduit-control-applet.desktop</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>calendar/conduits/calendar/calendar-conduit.c</a></td><td class='right'>1406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.1%;'/></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.h?h=WITH_LIBEFS'>calendar/conduits/calendar/calendar-conduit.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.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/conduits/todo/todo-conduit-control-applet.c?h=WITH_LIBEFS'>calendar/conduits/todo/todo-conduit-control-applet.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: 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/conduits/todo/todo-conduit-control-applet.desktop?h=WITH_LIBEFS'>calendar/conduits/todo/todo-conduit-control-applet.desktop</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.1%;'/><td class='none' style='width: 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/todo-conduit.c?h=WITH_LIBEFS'>calendar/conduits/todo/todo-conduit.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: 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/conduits/todo/todo-conduit.h?h=WITH_LIBEFS'>calendar/conduits/todo/todo-conduit.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.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/doc/.cvsignore?h=WITH_LIBEFS'>calendar/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/calendar/doc/C/.cvsignore?h=WITH_LIBEFS'>calendar/doc/C/.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/calendar/doc/C/Makefile.am?h=WITH_LIBEFS'>calendar/doc/C/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.2%;'/><td class='none' style='width: 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/doc/C/gnomecal.sgml?h=WITH_LIBEFS'>calendar/doc/C/gnomecal.sgml</a></td><td class='right'>465</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/calendar/doc/C/images/cal-props.gif?h=WITH_LIBEFS'>calendar/doc/C/images/cal-props.gif</a></td><td class='right'>bin</td><td class='graph'>8929 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/doc/C/images/calday.gif?h=WITH_LIBEFS'>calendar/doc/C/images/calday.gif</a></td><td class='right'>bin</td><td class='graph'>16264 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/doc/C/images/calmonth.gif?h=WITH_LIBEFS'>calendar/doc/C/images/calmonth.gif</a></td><td class='right'>bin</td><td class='graph'>13299 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/doc/C/images/calweek.gif?h=WITH_LIBEFS'>calendar/doc/C/images/calweek.gif</a></td><td class='right'>bin</td><td class='graph'>14650 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/doc/C/images/calyear.gif?h=WITH_LIBEFS'>calendar/doc/C/images/calyear.gif</a></td><td class='right'>bin</td><td class='graph'>27058 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/doc/C/topic.dat?h=WITH_LIBEFS'>calendar/doc/C/topic.dat</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/doc/Makefile.am?h=WITH_LIBEFS'>calendar/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/calendar/gui/.cvsignore?h=WITH_LIBEFS'>calendar/gui/.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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>calendar/gui/GNOME_Evolution_Calendar.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.2%;'/><td class='none' style='width: 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/GNOME_Evolution_Calendar.oafinfo?h=WITH_LIBEFS'>calendar/gui/GNOME_Evolution_Calendar.oafinfo</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.2%;'/><td class='none' style='width: 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/GNOME_Evolution_Calendar_Control.oaf.in?h=WITH_LIBEFS'>calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in</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.2%;'/><td class='none' style='width: 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/GNOME_Evolution_Calendar_Control.oafinfo?h=WITH_LIBEFS'>calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo</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.2%;'/><td class='none' style='width: 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/GNOME_Evolution_Calendar_gnomecal.oaf.in?h=WITH_LIBEFS'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.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.2%;'/><td class='none' style='width: 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/GNOME_Evolution_Calendar_gnomecal.oafinfo?h=WITH_LIBEFS'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo</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.2%;'/><td class='none' style='width: 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/GnomeCal.idl?h=WITH_LIBEFS'>calendar/gui/GnomeCal.idl</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.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/Makefile.am?h=WITH_LIBEFS'>calendar/gui/Makefile.am</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.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/alarm-notify/alarm-notify-dialog.c?h=WITH_LIBEFS'>calendar/gui/alarm-notify/alarm-notify-dialog.c</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: 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/alarm-notify/alarm-notify-dialog.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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.glade?h=WITH_LIBEFS'>calendar/gui/alarm-notify/alarm-notify.glade</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: 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/alarm-notify/alarm.c?h=WITH_LIBEFS'>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: 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/alarm-notify/alarm.h?h=WITH_LIBEFS'>calendar/gui/alarm-notify/alarm.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.2%;'/><td class='none' style='width: 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.c?h=WITH_LIBEFS'>calendar/gui/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: 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/alarm.h?h=WITH_LIBEFS'>calendar/gui/alarm.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.2%;'/><td class='none' style='width: 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/bell.xpm?h=WITH_LIBEFS'>calendar/gui/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.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/cal_struct.h?h=WITH_LIBEFS'>calendar/gui/cal_struct.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>calendar/gui/calendar-commands.c</a></td><td class='right'>954</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/calendar/gui/calendar-commands.h?h=WITH_LIBEFS'>calendar/gui/calendar-commands.h</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.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-component.c?h=WITH_LIBEFS'>calendar/gui/calendar-component.c</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.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-component.h?h=WITH_LIBEFS'>calendar/gui/calendar-component.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.2%;'/><td class='none' style='width: 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-conduit-control-applet.c?h=WITH_LIBEFS'>calendar/gui/calendar-conduit-control-applet.c</a></td><td class='right'>360</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/calendar-conduit-control-applet.desktop?h=WITH_LIBEFS'>calendar/gui/calendar-conduit-control-applet.desktop</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.1%;'/><td class='none' style='width: 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-conduit.c?h=WITH_LIBEFS'>calendar/gui/calendar-conduit.c</a></td><td class='right'>1406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.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-conduit.h?h=WITH_LIBEFS'>calendar/gui/calendar-conduit.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.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/calendar-control.gnorba?h=WITH_LIBEFS'>calendar/gui/calendar-control.gnorba</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.1%;'/><td class='none' style='width: 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-control.oafinfo?h=WITH_LIBEFS'>calendar/gui/calendar-control.oafinfo</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.2%;'/><td class='none' style='width: 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-model.c?h=WITH_LIBEFS'>calendar/gui/calendar-model.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: 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/calendar/gui/calendar-model.h?h=WITH_LIBEFS'>calendar/gui/calendar-model.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.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-pilot-sync.c?h=WITH_LIBEFS'>calendar/gui/calendar-pilot-sync.c</a></td><td class='right'>658</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/calendar/gui/component-factory.c?h=WITH_LIBEFS'>calendar/gui/component-factory.c</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.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/component-factory.h?h=WITH_LIBEFS'>calendar/gui/component-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.2%;'/><td class='none' style='width: 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/control-factory.c?h=WITH_LIBEFS'>calendar/gui/control-factory.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: 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/control-factory.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/dayview.xpm?h=WITH_LIBEFS'>calendar/gui/dayview.xpm</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.2%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>calendar/gui/dialogs/.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/calendar/gui/dialogs/Makefile.am?h=WITH_LIBEFS'>calendar/gui/dialogs/Makefile.am</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.2%;'/><td class='none' style='width: 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-notify-dialog.c?h=WITH_LIBEFS'>calendar/gui/dialogs/alarm-notify-dialog.c</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: 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/dialogs/alarm-notify-dialog.h?h=WITH_LIBEFS'>calendar/gui/dialogs/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.2%;'/><td class='none' style='width: 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-notify.glade?h=WITH_LIBEFS'>calendar/gui/dialogs/alarm-notify.glade</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: 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/alarm-notify.glade.h?h=WITH_LIBEFS'>calendar/gui/dialogs/alarm-notify.glade.h</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>calendar/gui/e-day-view-main-item.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: 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/calendar/gui/e-day-view-main-item.h?h=WITH_LIBEFS'>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.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-day-view-time-item.c?h=WITH_LIBEFS'>calendar/gui/e-day-view-time-item.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: 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/calendar/gui/e-day-view-time-item.h?h=WITH_LIBEFS'>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.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-day-view-top-item.c?h=WITH_LIBEFS'>calendar/gui/e-day-view-top-item.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: 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/e-day-view-top-item.h?h=WITH_LIBEFS'>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.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-day-view.c?h=WITH_LIBEFS'>calendar/gui/e-day-view.c</a></td><td class='right'>5545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 31.3%;'/><td class='none' style='width: 68.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-day-view.h?h=WITH_LIBEFS'>calendar/gui/e-day-view.h</a></td><td class='right'>504</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/e-week-view-event-item.c?h=WITH_LIBEFS'>calendar/gui/e-week-view-event-item.c</a></td><td class='right'>750</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/calendar/gui/e-week-view-event-item.h?h=WITH_LIBEFS'>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.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-week-view-main-item.c?h=WITH_LIBEFS'>calendar/gui/e-week-view-main-item.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: 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-main-item.h?h=WITH_LIBEFS'>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.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-week-view-titles-item.c?h=WITH_LIBEFS'>calendar/gui/e-week-view-titles-item.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: 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-week-view-titles-item.h?h=WITH_LIBEFS'>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.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-week-view.c?h=WITH_LIBEFS'>calendar/gui/e-week-view.c</a></td><td class='right'>2838</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.0%;'/><td class='none' style='width: 84.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.h?h=WITH_LIBEFS'>calendar/gui/e-week-view.h</a></td><td class='right'>380</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/event-editor-dialog.glade?h=WITH_LIBEFS'>calendar/gui/event-editor-dialog.glade</a></td><td class='right'>2001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.3%;'/><td class='none' style='width: 88.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/event-editor-dialog.glade.h?h=WITH_LIBEFS'>calendar/gui/event-editor-dialog.glade.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.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/event-editor.c?h=WITH_LIBEFS'>calendar/gui/event-editor.c</a></td><td class='right'>1892</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.7%;'/><td class='none' style='width: 89.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/event-editor.h?h=WITH_LIBEFS'>calendar/gui/event-editor.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.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/evolution-calendar-control.c?h=WITH_LIBEFS'>calendar/gui/evolution-calendar-control.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: 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/evolution-calendar.gnorba?h=WITH_LIBEFS'>calendar/gui/evolution-calendar.gnorba</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.1%;'/><td class='none' style='width: 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/evolution-calendar.oafinfo?h=WITH_LIBEFS'>calendar/gui/evolution-calendar.oafinfo</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.2%;'/><td class='none' style='width: 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/getdate.y?h=WITH_LIBEFS'>calendar/gui/getdate.y</a></td><td class='right'>1001</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/gncal-todo.c?h=WITH_LIBEFS'>calendar/gui/gncal-todo.c</a></td><td class='right'>903</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/calendar/gui/gncal-todo.h?h=WITH_LIBEFS'>calendar/gui/gncal-todo.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.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/gnome-cal.c?h=WITH_LIBEFS'>calendar/gui/gnome-cal.c</a></td><td class='right'>1446</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/calendar/gui/gnome-cal.h?h=WITH_LIBEFS'>calendar/gui/gnome-cal.h</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.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/gnome-cal.html?h=WITH_LIBEFS'>calendar/gui/gnome-cal.html</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.2%;'/><td class='none' style='width: 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/gnome-calendar-conduit.png?h=WITH_LIBEFS'>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/gnome-month-item.c?h=WITH_LIBEFS'>calendar/gui/gnome-month-item.c</a></td><td class='right'>1246</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/calendar/gui/gnome-month-item.h?h=WITH_LIBEFS'>calendar/gui/gnome-month-item.h</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.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/gnomecal.gnorba?h=WITH_LIBEFS'>calendar/gui/gnomecal.gnorba</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.1%;'/><td class='none' style='width: 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/gnomecal.oafinfo?h=WITH_LIBEFS'>calendar/gui/gnomecal.oafinfo</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.2%;'/><td class='none' style='width: 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/goto.c?h=WITH_LIBEFS'>calendar/gui/goto.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: 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/icalendar-types?h=WITH_LIBEFS'>calendar/gui/icalendar-types</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.2%;'/><td class='none' style='width: 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/jump.xpm?h=WITH_LIBEFS'>calendar/gui/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.1%;'/><td class='none' style='width: 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/layout.c?h=WITH_LIBEFS'>calendar/gui/layout.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: 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/layout.h?h=WITH_LIBEFS'>calendar/gui/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.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/main.c?h=WITH_LIBEFS'>calendar/gui/main.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.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/mark.c?h=WITH_LIBEFS'>calendar/gui/mark.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: 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/mark.h?h=WITH_LIBEFS'>calendar/gui/mark.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.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/monthview.xpm?h=WITH_LIBEFS'>calendar/gui/monthview.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.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/popup-menu.c?h=WITH_LIBEFS'>calendar/gui/popup-menu.c</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.2%;'/><td class='none' style='width: 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/popup-menu.h?h=WITH_LIBEFS'>calendar/gui/popup-menu.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/calendar/gui/print.c?h=WITH_LIBEFS'>calendar/gui/print.c</a></td><td class='right'>1255</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/calendar/gui/print.h?h=WITH_LIBEFS'>calendar/gui/print.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.2%;'/><td class='none' style='width: 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/prop.c?h=WITH_LIBEFS'>calendar/gui/prop.c</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: 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/calendar/gui/recur.xpm?h=WITH_LIBEFS'>calendar/gui/recur.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.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/test.vcf?h=WITH_LIBEFS'>calendar/gui/test.vcf</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.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/test2.vcf?h=WITH_LIBEFS'>calendar/gui/test2.vcf</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.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/todo-conduit-control-applet.c?h=WITH_LIBEFS'>calendar/gui/todo-conduit-control-applet.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: 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/todo-conduit-control-applet.desktop?h=WITH_LIBEFS'>calendar/gui/todo-conduit-control-applet.desktop</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.1%;'/><td class='none' style='width: 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/todo-conduit.c?h=WITH_LIBEFS'>calendar/gui/todo-conduit.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: 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/todo-conduit.h?h=WITH_LIBEFS'>calendar/gui/todo-conduit.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.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/topic.dat?h=WITH_LIBEFS'>calendar/gui/topic.dat</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/gui/weekview.xpm?h=WITH_LIBEFS'>calendar/gui/weekview.xpm</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.2%;'/><td class='none' style='width: 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/workweekview.xpm?h=WITH_LIBEFS'>calendar/gui/workweekview.xpm</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.2%;'/><td class='none' style='width: 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/yearview.xpm?h=WITH_LIBEFS'>calendar/gui/yearview.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.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/idl/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>calendar/idl/evolution-calendar.idl</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.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/pcs/.cvsignore?h=WITH_LIBEFS'>calendar/pcs/.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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>calendar/pcs/Makefile.am</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.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-imc.c?h=WITH_LIBEFS'>calendar/pcs/cal-backend-imc.c</a></td><td class='right'>1350</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/calendar/pcs/cal-backend-imc.h?h=WITH_LIBEFS'>calendar/pcs/cal-backend-imc.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.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.c?h=WITH_LIBEFS'>calendar/pcs/cal-backend.c</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: 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/pcs/cal-backend.h?h=WITH_LIBEFS'>calendar/pcs/cal-backend.h</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.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/pcs/cal-common.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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-factory.c?h=WITH_LIBEFS'>calendar/pcs/cal-factory.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: 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/pcs/cal-factory.h?h=WITH_LIBEFS'>calendar/pcs/cal-factory.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.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.c?h=WITH_LIBEFS'>calendar/pcs/cal.c</a></td><td class='right'>736</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/pcs/cal.h?h=WITH_LIBEFS'>calendar/pcs/cal.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.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/job.c?h=WITH_LIBEFS'>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.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/pcs/job.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>camel/.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/CODING.STYLE?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/ChangeLog?h=WITH_LIBEFS'>camel/ChangeLog</a></td><td class='right'>3864</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.8%;'/><td class='none' style='width: 78.2%;'/></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=WITH_LIBEFS'>camel/Makefile.am</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.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/README?h=WITH_LIBEFS'>camel/README</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.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/README.COPYRIGHT?h=WITH_LIBEFS'>camel/README.COPYRIGHT</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.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/README.HACKING?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>camel/camel-address.c</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.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-address.h?h=WITH_LIBEFS'>camel/camel-address.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.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-collector.c?h=WITH_LIBEFS'>camel/camel-arg-collector.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: 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-data-wrapper.c?h=WITH_LIBEFS'>camel/camel-data-wrapper.c</a></td><td class='right'>288</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-data-wrapper.h?h=WITH_LIBEFS'>camel/camel-data-wrapper.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.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-exception-list.def?h=WITH_LIBEFS'>camel/camel-exception-list.def</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.2%;'/><td class='none' style='width: 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-exception.c?h=WITH_LIBEFS'>camel/camel-exception.c</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: 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-exception.h?h=WITH_LIBEFS'>camel/camel-exception.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.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-folder-pt-proxy.c?h=WITH_LIBEFS'>camel/camel-folder-pt-proxy.c</a></td><td class='right'>809</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-pt-proxy.h?h=WITH_LIBEFS'>camel/camel-folder-pt-proxy.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.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-folder-search.c?h=WITH_LIBEFS'>camel/camel-folder-search.c</a></td><td class='right'>496</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/camel/camel-folder-search.h?h=WITH_LIBEFS'>camel/camel-folder-search.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.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-folder-summary.c?h=WITH_LIBEFS'>camel/camel-folder-summary.c</a></td><td class='right'>1516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 91.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-folder-summary.h?h=WITH_LIBEFS'>camel/camel-folder-summary.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: 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-folder.c?h=WITH_LIBEFS'>camel/camel-folder.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: 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/camel/camel-folder.h?h=WITH_LIBEFS'>camel/camel-folder.h</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: 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-internet-address.c?h=WITH_LIBEFS'>camel/camel-internet-address.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: 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-internet-address.h?h=WITH_LIBEFS'>camel/camel-internet-address.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.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-marshal-utils.c?h=WITH_LIBEFS'>camel/camel-marshal-utils.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: 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-marshal-utils.h?h=WITH_LIBEFS'>camel/camel-marshal-utils.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.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-medium.c?h=WITH_LIBEFS'>camel/camel-medium.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: 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-medium.h?h=WITH_LIBEFS'>camel/camel-medium.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.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-basic.c?h=WITH_LIBEFS'>camel/camel-mime-filter-basic.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: 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-basic.h?h=WITH_LIBEFS'>camel/camel-mime-filter-basic.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.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-charset.c?h=WITH_LIBEFS'>camel/camel-mime-filter-charset.c</a></td><td class='right'>243</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-mime-filter-charset.h?h=WITH_LIBEFS'>camel/camel-mime-filter-charset.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.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-crlf.c?h=WITH_LIBEFS'>camel/camel-mime-filter-crlf.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.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-filter-crlf.h?h=WITH_LIBEFS'>camel/camel-mime-filter-crlf.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.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-from.c?h=WITH_LIBEFS'>camel/camel-mime-filter-from.c</a></td><td class='right'>243</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-mime-filter-from.h?h=WITH_LIBEFS'>camel/camel-mime-filter-from.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.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-index.c?h=WITH_LIBEFS'>camel/camel-mime-filter-index.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: 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-mime-filter-index.h?h=WITH_LIBEFS'>camel/camel-mime-filter-index.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.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.c?h=WITH_LIBEFS'>camel/camel-mime-filter-save.c</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.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-filter-save.h?h=WITH_LIBEFS'>camel/camel-mime-filter-save.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.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.c?h=WITH_LIBEFS'>camel/camel-mime-filter.c</a></td><td class='right'>228</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-mime-filter.h?h=WITH_LIBEFS'>camel/camel-mime-filter.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.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-message.c?h=WITH_LIBEFS'>camel/camel-mime-message.c</a></td><td class='right'>538</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/camel-mime-message.h?h=WITH_LIBEFS'>camel/camel-mime-message.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.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-parser.c?h=WITH_LIBEFS'>camel/camel-mime-parser.c</a></td><td class='right'>1804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 89.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-parser.h?h=WITH_LIBEFS'>camel/camel-mime-parser.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.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-part-utils.c?h=WITH_LIBEFS'>camel/camel-mime-part-utils.c</a></td><td class='right'>234</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-mime-part-utils.h?h=WITH_LIBEFS'>camel/camel-mime-part-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.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.c?h=WITH_LIBEFS'>camel/camel-mime-part.c</a></td><td class='right'>716</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/camel/camel-mime-part.h?h=WITH_LIBEFS'>camel/camel-mime-part.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.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-utils.c?h=WITH_LIBEFS'>camel/camel-mime-utils.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: 13.8%;'/><td class='none' style='width: 86.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=WITH_LIBEFS'>camel/camel-mime-utils.h</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.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-movemail.c?h=WITH_LIBEFS'>camel/camel-movemail.c</a></td><td class='right'>500</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/camel/camel-movemail.h?h=WITH_LIBEFS'>camel/camel-movemail.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.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-multipart.c?h=WITH_LIBEFS'>camel/camel-multipart.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: 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/camel/camel-multipart.h?h=WITH_LIBEFS'>camel/camel-multipart.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.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-news-address.c?h=WITH_LIBEFS'>camel/camel-news-address.c</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.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-news-address.h?h=WITH_LIBEFS'>camel/camel-news-address.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.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-object.c?h=WITH_LIBEFS'>camel/camel-object.c</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.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-object.h?h=WITH_LIBEFS'>camel/camel-object.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.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-op-queue.c?h=WITH_LIBEFS'>camel/camel-op-queue.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.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-op-queue.h?h=WITH_LIBEFS'>camel/camel-op-queue.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.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.c?h=WITH_LIBEFS'>camel/camel-provider.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.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-provider.h?h=WITH_LIBEFS'>camel/camel-provider.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.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.c?h=WITH_LIBEFS'>camel/camel-seekable-stream.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: 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-seekable-stream.h?h=WITH_LIBEFS'>camel/camel-seekable-stream.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.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-substream.c?h=WITH_LIBEFS'>camel/camel-seekable-substream.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: 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-seekable-substream.h?h=WITH_LIBEFS'>camel/camel-seekable-substream.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.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-service.c?h=WITH_LIBEFS'>camel/camel-service.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: 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-service.h?h=WITH_LIBEFS'>camel/camel-service.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.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-session.c?h=WITH_LIBEFS'>camel/camel-session.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: 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/camel/camel-session.h?h=WITH_LIBEFS'>camel/camel-session.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.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-store.c?h=WITH_LIBEFS'>camel/camel-store.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: 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-store.h?h=WITH_LIBEFS'>camel/camel-store.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.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-buffer.c?h=WITH_LIBEFS'>camel/camel-stream-buffer.c</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: 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-stream-buffer.h?h=WITH_LIBEFS'>camel/camel-stream-buffer.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.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-filter.c?h=WITH_LIBEFS'>camel/camel-stream-filter.c</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: 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/camel-stream-filter.h?h=WITH_LIBEFS'>camel/camel-stream-filter.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.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-stream-fs.c?h=WITH_LIBEFS'>camel/camel-stream-fs.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: 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/camel/camel-stream-fs.h?h=WITH_LIBEFS'>camel/camel-stream-fs.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.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-stream-mem.c?h=WITH_LIBEFS'>camel/camel-stream-mem.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: 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-stream-mem.h?h=WITH_LIBEFS'>camel/camel-stream-mem.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.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-stream.c?h=WITH_LIBEFS'>camel/camel-stream.c</a></td><td class='right'>294</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/camel/camel-stream.h?h=WITH_LIBEFS'>camel/camel-stream.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.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-thread-proxy.c?h=WITH_LIBEFS'>camel/camel-thread-proxy.c</a></td><td class='right'>514</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-thread-proxy.h?h=WITH_LIBEFS'>camel/camel-thread-proxy.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.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-transport.c?h=WITH_LIBEFS'>camel/camel-transport.c</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.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-transport.h?h=WITH_LIBEFS'>camel/camel-transport.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.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-types.h?h=WITH_LIBEFS'>camel/camel-types.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.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-url.c?h=WITH_LIBEFS'>camel/camel-url.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: 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-url.h?h=WITH_LIBEFS'>camel/camel-url.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.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.c?h=WITH_LIBEFS'>camel/camel.c</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.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.h?h=WITH_LIBEFS'>camel/camel.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.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/devel-docs/camel_data_wrapper.dia?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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/gmime-content-field.c?h=WITH_LIBEFS'>camel/gmime-content-field.c</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: 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/gmime-content-field.h?h=WITH_LIBEFS'>camel/gmime-content-field.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.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/gstring-util.c?h=WITH_LIBEFS'>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: 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/gstring-util.h?h=WITH_LIBEFS'>camel/gstring-util.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.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/hash-table-utils.c?h=WITH_LIBEFS'>camel/hash-table-utils.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.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/hash-table-utils.h?h=WITH_LIBEFS'>camel/hash-table-utils.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.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/md5-utils.c?h=WITH_LIBEFS'>camel/md5-utils.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: 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/md5-utils.h?h=WITH_LIBEFS'>camel/md5-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.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/.cvsignore?h=WITH_LIBEFS'>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/MH/.cvsignore?h=WITH_LIBEFS'>camel/providers/MH/.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/camel/providers/MH/Makefile.am?h=WITH_LIBEFS'>camel/providers/MH/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.2%;'/><td class='none' style='width: 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/MH/camel-mh-folder.c?h=WITH_LIBEFS'>camel/providers/MH/camel-mh-folder.c</a></td><td class='right'>1022</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/camel/providers/MH/camel-mh-folder.h?h=WITH_LIBEFS'>camel/providers/MH/camel-mh-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.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/MH/camel-mh-provider.c?h=WITH_LIBEFS'>camel/providers/MH/camel-mh-provider.c</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.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/MH/camel-mh-store.c?h=WITH_LIBEFS'>camel/providers/MH/camel-mh-store.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.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/MH/camel-mh-store.h?h=WITH_LIBEFS'>camel/providers/MH/camel-mh-store.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.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/MH/mh-summary.c?h=WITH_LIBEFS'>camel/providers/MH/mh-summary.c</a></td><td class='right'>290</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/MH/mh-summary.h?h=WITH_LIBEFS'>camel/providers/MH/mh-summary.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.2%;'/><td class='none' style='width: 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/MH/mh-uid.c?h=WITH_LIBEFS'>camel/providers/MH/mh-uid.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: 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/MH/mh-uid.h?h=WITH_LIBEFS'>camel/providers/MH/mh-uid.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.2%;'/><td class='none' style='width: 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/MH/mh-utils.c?h=WITH_LIBEFS'>camel/providers/MH/mh-utils.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.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/MH/mh-utils.h?h=WITH_LIBEFS'>camel/providers/MH/mh-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.2%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>camel/providers/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/camel/providers/imap/.cvsignore?h=WITH_LIBEFS'>camel/providers/imap/.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/providers/imap/Makefile.am?h=WITH_LIBEFS'>camel/providers/imap/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.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-folder.c?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-folder.c</a></td><td class='right'>1245</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/camel/providers/imap/camel-imap-folder.h?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-folder.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.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/imap/camel-imap-provider.c?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-provider.c</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.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/imap/camel-imap-store.c?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-store.c</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: 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/camel/providers/imap/camel-imap-store.h?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-store.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.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-stream.c?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-stream.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: 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/imap/camel-imap-stream.h?h=WITH_LIBEFS'>camel/providers/imap/camel-imap-stream.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.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/imap/libcamelimap.urls?h=WITH_LIBEFS'>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/maildir/.cvsignore?h=WITH_LIBEFS'>camel/providers/maildir/.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/camel/providers/maildir/Makefile.am?h=WITH_LIBEFS'>camel/providers/maildir/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/camel/providers/maildir/camel-maildir-folder.c?h=WITH_LIBEFS'>camel/providers/maildir/camel-maildir-folder.c</a></td><td class='right'>802</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/providers/maildir/camel-maildir-folder.h?h=WITH_LIBEFS'>camel/providers/maildir/camel-maildir-folder.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.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/maildir/camel-maildir-provider.c?h=WITH_LIBEFS'>camel/providers/maildir/camel-maildir-provider.c</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.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/maildir/camel-maildir-store.c?h=WITH_LIBEFS'>camel/providers/maildir/camel-maildir-store.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.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/maildir/camel-maildir-store.h?h=WITH_LIBEFS'>camel/providers/maildir/camel-maildir-store.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.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/mbox/.cvsignore?h=WITH_LIBEFS'>camel/providers/mbox/.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/providers/mbox/Makefile.am?h=WITH_LIBEFS'>camel/providers/mbox/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.2%;'/><td class='none' style='width: 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/mbox/camel-mbox-folder.c?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-folder.c</a></td><td class='right'>606</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/providers/mbox/camel-mbox-folder.h?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-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.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/mbox/camel-mbox-provider.c?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-provider.c</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.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/mbox/camel-mbox-store.c?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-store.c</a></td><td class='right'>228</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/mbox/camel-mbox-store.h?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-store.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.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/mbox/camel-mbox-summary.c?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-summary.c</a></td><td class='right'>771</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/camel/providers/mbox/camel-mbox-summary.h?h=WITH_LIBEFS'>camel/providers/mbox/camel-mbox-summary.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.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/mbox/libcamelmbox.urls?h=WITH_LIBEFS'>camel/providers/mbox/libcamelmbox.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/nntp/.cvsignore?h=WITH_LIBEFS'>camel/providers/nntp/.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/providers/nntp/Makefile.am?h=WITH_LIBEFS'>camel/providers/nntp/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.2%;'/><td class='none' style='width: 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-folder.c?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-folder.c</a></td><td class='right'>469</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/providers/nntp/camel-nntp-folder.h?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-folder.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.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/nntp/camel-nntp-newsrc.c?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-newsrc.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: 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/providers/nntp/camel-nntp-newsrc.h?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-newsrc.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-provider.c</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.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/nntp/camel-nntp-store.c?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-store.c</a></td><td class='right'>487</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/nntp/camel-nntp-store.h?h=WITH_LIBEFS'>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.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-utils.c?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-utils.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: 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/nntp/camel-nntp-utils.h?h=WITH_LIBEFS'>camel/providers/nntp/camel-nntp-utils.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.2%;'/><td class='none' style='width: 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/libcamelnntp.urls?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>camel/providers/pop3/.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/camel/providers/pop3/Makefile.am?h=WITH_LIBEFS'>camel/providers/pop3/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.2%;'/><td class='none' style='width: 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-folder.c?h=WITH_LIBEFS'>camel/providers/pop3/camel-pop3-folder.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: 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/providers/pop3/camel-pop3-folder.h?h=WITH_LIBEFS'>camel/providers/pop3/camel-pop3-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.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/pop3/camel-pop3-provider.c?h=WITH_LIBEFS'>camel/providers/pop3/camel-pop3-provider.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.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-store.c?h=WITH_LIBEFS'>camel/providers/pop3/camel-pop3-store.c</a></td><td class='right'>682</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/camel/providers/pop3/camel-pop3-store.h?h=WITH_LIBEFS'>camel/providers/pop3/camel-pop3-store.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.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/pop3/libcamelpop3.urls?h=WITH_LIBEFS'>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=WITH_LIBEFS'>camel/providers/sendmail/.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/providers/sendmail/Makefile.am?h=WITH_LIBEFS'>camel/providers/sendmail/Makefile.am</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.2%;'/><td class='none' style='width: 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/sendmail/camel-sendmail-provider.c?h=WITH_LIBEFS'>camel/providers/sendmail/camel-sendmail-provider.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.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/sendmail/camel-sendmail-transport.c?h=WITH_LIBEFS'>camel/providers/sendmail/camel-sendmail-transport.c</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: 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/sendmail/camel-sendmail-transport.h?h=WITH_LIBEFS'>camel/providers/sendmail/camel-sendmail-transport.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.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/sendmail/libcamelsendmail.urls?h=WITH_LIBEFS'>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=WITH_LIBEFS'>camel/providers/smtp/.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/camel/providers/smtp/Makefile.am?h=WITH_LIBEFS'>camel/providers/smtp/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.2%;'/><td class='none' style='width: 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-provider.c?h=WITH_LIBEFS'>camel/providers/smtp/camel-smtp-provider.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.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/smtp/camel-smtp-transport.c?h=WITH_LIBEFS'>camel/providers/smtp/camel-smtp-transport.c</a></td><td class='right'>787</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/camel/providers/smtp/camel-smtp-transport.h?h=WITH_LIBEFS'>camel/providers/smtp/camel-smtp-transport.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.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/smtp/libcamelsmtp.urls?h=WITH_LIBEFS'>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/providers/vee/.cvsignore?h=WITH_LIBEFS'>camel/providers/vee/.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/providers/vee/Makefile.am?h=WITH_LIBEFS'>camel/providers/vee/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.2%;'/><td class='none' style='width: 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/vee/camel-vee-folder.c?h=WITH_LIBEFS'>camel/providers/vee/camel-vee-folder.c</a></td><td class='right'>587</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/camel/providers/vee/camel-vee-folder.h?h=WITH_LIBEFS'>camel/providers/vee/camel-vee-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.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/vee/camel-vee-provider.c?h=WITH_LIBEFS'>camel/providers/vee/camel-vee-provider.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.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/vee/camel-vee-store.c?h=WITH_LIBEFS'>camel/providers/vee/camel-vee-store.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.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/vee/camel-vee-store.h?h=WITH_LIBEFS'>camel/providers/vee/camel-vee-store.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.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/vee/libcamelvee.urls?h=WITH_LIBEFS'>camel/providers/vee/libcamelvee.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=WITH_LIBEFS'>camel/string-utils.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: 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/string-utils.h?h=WITH_LIBEFS'>camel/string-utils.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.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/.cvsignore?h=WITH_LIBEFS'>composer/.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/composer/ChangeLog?h=WITH_LIBEFS'>composer/ChangeLog</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: 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/Makefile.am?h=WITH_LIBEFS'>composer/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.2%;'/><td class='none' style='width: 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-address-dialog.c?h=WITH_LIBEFS'>composer/e-msg-composer-address-dialog.c</a></td><td class='right'>660</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/composer/e-msg-composer-address-dialog.glade?h=WITH_LIBEFS'>composer/e-msg-composer-address-dialog.glade</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: 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/composer/e-msg-composer-address-dialog.glade.h?h=WITH_LIBEFS'>composer/e-msg-composer-address-dialog.glade.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.1%;'/><td class='none' style='width: 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-address-dialog.h?h=WITH_LIBEFS'>composer/e-msg-composer-address-dialog.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.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-address-entry.c?h=WITH_LIBEFS'>composer/e-msg-composer-address-entry.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: 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/composer/e-msg-composer-address-entry.h?h=WITH_LIBEFS'>composer/e-msg-composer-address-entry.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.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=WITH_LIBEFS'>composer/e-msg-composer-attachment-bar.c</a></td><td class='right'>653</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/composer/e-msg-composer-attachment-bar.h?h=WITH_LIBEFS'>composer/e-msg-composer-attachment-bar.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.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.c?h=WITH_LIBEFS'>composer/e-msg-composer-attachment.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: 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/composer/e-msg-composer-attachment.glade?h=WITH_LIBEFS'>composer/e-msg-composer-attachment.glade</a></td><td class='right'>258</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/composer/e-msg-composer-attachment.glade.h?h=WITH_LIBEFS'>composer/e-msg-composer-attachment.glade.h</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.1%;'/><td class='none' style='width: 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-attachment.h?h=WITH_LIBEFS'>composer/e-msg-composer-attachment.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.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-hdrs.c?h=WITH_LIBEFS'>composer/e-msg-composer-hdrs.c</a></td><td class='right'>422</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/composer/e-msg-composer-hdrs.h?h=WITH_LIBEFS'>composer/e-msg-composer-hdrs.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.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/e-msg-composer-select-file.c?h=WITH_LIBEFS'>composer/e-msg-composer-select-file.c</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: 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/composer/e-msg-composer-select-file.h?h=WITH_LIBEFS'>composer/e-msg-composer-select-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.2%;'/><td class='none' style='width: 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.c?h=WITH_LIBEFS'>composer/e-msg-composer.c</a></td><td class='right'>1186</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/e-msg-composer.h?h=WITH_LIBEFS'>composer/e-msg-composer.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.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/main.c?h=WITH_LIBEFS'>composer/main.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.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/configure.in?h=WITH_LIBEFS'>configure.in</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: 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/data/.cvsignore?h=WITH_LIBEFS'>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/data/Makefile.am?h=WITH_LIBEFS'>data/Makefile.am</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/data/evolution.desktop?h=WITH_LIBEFS'>data/evolution.desktop</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.1%;'/><td class='none' style='width: 99.9%;'/></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=WITH_LIBEFS'>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=WITH_LIBEFS'>default_user/ChangeLog</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.2%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>default_user/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/default_user/local/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>default_user/local/Contacts/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/Contacts/folder-metadata.xml?h=WITH_LIBEFS'>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/Directories/.cvsignore?h=WITH_LIBEFS'>default_user/local/Directories/.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/Directories/Makefile.am?h=WITH_LIBEFS'>default_user/local/Directories/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.1%;'/><td class='none' style='width: 99.9%;'/></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/Directories/folder-metadata.xml?h=WITH_LIBEFS'>default_user/local/Directories/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/Directories/subfolders/.cvsignore?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/.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/Directories/subfolders/Bigfoot/.cvsignore?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Bigfoot/.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/Directories/subfolders/Bigfoot/Makefile.am?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Bigfoot/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/Directories/subfolders/Bigfoot/folder-metadata.xml?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Bigfoot/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/Directories/subfolders/Bigfoot/uri?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Bigfoot/uri</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/default_user/local/Directories/subfolders/Makefile.am?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/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/Directories/subfolders/Netcenter/.cvsignore?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Netcenter/.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/Directories/subfolders/Netcenter/Makefile.am?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Netcenter/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/Directories/subfolders/Netcenter/folder-metadata.xml?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Netcenter/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/Directories/subfolders/Netcenter/uri?h=WITH_LIBEFS'>default_user/local/Directories/subfolders/Netcenter/uri</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/default_user/local/Drafts/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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/Inbox/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>default_user/local/Inbox/mbox</a></td><td class='right'>2225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.5%;'/><td class='none' style='width: 87.5%;'/></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=WITH_LIBEFS'>default_user/local/Makefile.am</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/default_user/local/Outbox/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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/Trash/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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/shortcuts.xml?h=WITH_LIBEFS'>default_user/shortcuts.xml</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/devel-docs/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>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.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/devel-docs/camel/README_AND_TODO.txt?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/camel-docs.sgml?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/camel-sections.txt?h=WITH_LIBEFS'>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.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/camel/camel.types?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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.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/camel/tmpl/camel-mime-message.sgml?h=WITH_LIBEFS'>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: 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/devel-docs/camel/tmpl/camel-mime-part.sgml?h=WITH_LIBEFS'>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.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/camel/tmpl/camel-recipient.sgml?h=WITH_LIBEFS'>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.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/camel/tmpl/camel-service.sgml?h=WITH_LIBEFS'>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.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-store.sgml?h=WITH_LIBEFS'>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.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-stream.sgml?h=WITH_LIBEFS'>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.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/devel-docs/misc/ref_and_id_proposition.txt?h=WITH_LIBEFS'>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: 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/devel-docs/query/virtual-folder-in-depth.sgml?h=WITH_LIBEFS'>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: 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/devel-docs/query/virtual-folder-in-depth.txt?h=WITH_LIBEFS'>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: 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/doc/.cvsignore?h=WITH_LIBEFS'>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/C/.cvsignore?h=WITH_LIBEFS'>doc/C/.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/doc/C/Makefile.am?h=WITH_LIBEFS'>doc/C/Makefile.am</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.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/C/apx-authors.sgml?h=WITH_LIBEFS'>doc/C/apx-authors.sgml</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.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/C/apx-bugs.sgml?h=WITH_LIBEFS'>doc/C/apx-bugs.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.1%;'/><td class='none' style='width: 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/C/apx-fdl.sgml?h=WITH_LIBEFS'>doc/C/apx-fdl.sgml</a></td><td class='right'>678</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/doc/C/apx-gloss.sgml?h=WITH_LIBEFS'>doc/C/apx-gloss.sgml</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: 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/doc/C/config-prefs.sgml?h=WITH_LIBEFS'>doc/C/config-prefs.sgml</a></td><td class='right'>496</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/doc/C/config-setupassist.sgml?h=WITH_LIBEFS'>doc/C/config-setupassist.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.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/C/config-sync.sgml?h=WITH_LIBEFS'>doc/C/config-sync.sgml</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.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/C/devel-action.sgml?h=WITH_LIBEFS'>doc/C/devel-action.sgml</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.1%;'/><td class='none' style='width: 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/C/devel-component.sgml?h=WITH_LIBEFS'>doc/C/devel-component.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/C/devel-script.sgml?h=WITH_LIBEFS'>doc/C/devel-script.sgml</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.1%;'/><td class='none' style='width: 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/C/evolution-guide.sgml?h=WITH_LIBEFS'>doc/C/evolution-guide.sgml</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.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/C/fig/calendar.png?h=WITH_LIBEFS'>doc/C/fig/calendar.png</a></td><td class='right'>bin</td><td class='graph'>30522 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/config-cal.png?h=WITH_LIBEFS'>doc/C/fig/config-cal.png</a></td><td class='right'>bin</td><td class='graph'>12762 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/config-mail.png?h=WITH_LIBEFS'>doc/C/fig/config-mail.png</a></td><td class='right'>bin</td><td class='graph'>5344 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/contact.png?h=WITH_LIBEFS'>doc/C/fig/contact.png</a></td><td class='right'>bin</td><td class='graph'>27473 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/filter-new-fig.png?h=WITH_LIBEFS'>doc/C/fig/filter-new-fig.png</a></td><td class='right'>bin</td><td class='graph'>7393 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/mail-druid-pic.png?h=WITH_LIBEFS'>doc/C/fig/mail-druid-pic.png</a></td><td class='right'>bin</td><td class='graph'>35959 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/mainwindow-pic.png?h=WITH_LIBEFS'>doc/C/fig/mainwindow-pic.png</a></td><td class='right'>bin</td><td class='graph'>261494 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/vfolder-createrule-fig.png?h=WITH_LIBEFS'>doc/C/fig/vfolder-createrule-fig.png</a></td><td class='right'>bin</td><td class='graph'>7324 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/preface.sgml?h=WITH_LIBEFS'>doc/C/preface.sgml</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.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/doc/C/usage-calendar.sgml?h=WITH_LIBEFS'>doc/C/usage-calendar.sgml</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: 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/doc/C/usage-contact.sgml?h=WITH_LIBEFS'>doc/C/usage-contact.sgml</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: 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/doc/C/usage-mail.sgml?h=WITH_LIBEFS'>doc/C/usage-mail.sgml</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: 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/doc/C/usage-mainwindow.sgml?h=WITH_LIBEFS'>doc/C/usage-mainwindow.sgml</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: 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/doc/C/usage-sync.sgml?h=WITH_LIBEFS'>doc/C/usage-sync.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.1%;'/><td class='none' style='width: 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/Camel-Classes?h=WITH_LIBEFS'>doc/Camel-Classes</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>doc/ChangeLog</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: 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/Design?h=WITH_LIBEFS'>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: 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/Makefile.am?h=WITH_LIBEFS'>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/white-papers/calendar/calendar.sgml?h=WITH_LIBEFS'>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: 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/white-papers/mail/camel.sgml?h=WITH_LIBEFS'>doc/white-papers/mail/camel.sgml</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: 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/doc/white-papers/mail/ibex.sgml?h=WITH_LIBEFS'>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.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/doc/white-papers/widgets/e-table.sgml?h=WITH_LIBEFS'>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: 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/e-util/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>e-util/ChangeLog</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: 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/e-util/Makefile.am?h=WITH_LIBEFS'>e-util/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.2%;'/><td class='none' style='width: 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-canvas-utils.c?h=WITH_LIBEFS'>e-util/e-canvas-utils.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.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-canvas-utils.h?h=WITH_LIBEFS'>e-util/e-canvas-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.2%;'/><td class='none' style='width: 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-canvas.c?h=WITH_LIBEFS'>e-util/e-canvas.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: 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/e-util/e-canvas.h?h=WITH_LIBEFS'>e-util/e-canvas.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.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-cursors.c?h=WITH_LIBEFS'>e-util/e-cursors.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.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-cursors.h?h=WITH_LIBEFS'>e-util/e-cursors.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.2%;'/><td class='none' style='width: 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-dialog-widgets.c?h=WITH_LIBEFS'>e-util/e-dialog-widgets.c</a></td><td class='right'>650</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/e-util/e-dialog-widgets.h?h=WITH_LIBEFS'>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.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-gui-utils.c?h=WITH_LIBEFS'>e-util/e-gui-utils.c</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.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-gui-utils.h?h=WITH_LIBEFS'>e-util/e-gui-utils.h</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>e-util/e-html-utils.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: 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-html-utils.h?h=WITH_LIBEFS'>e-util/e-html-utils.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.2%;'/><td class='none' style='width: 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-popup-menu.c?h=WITH_LIBEFS'>e-util/e-popup-menu.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.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-popup-menu.h?h=WITH_LIBEFS'>e-util/e-popup-menu.h</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.1%;'/><td class='none' style='width: 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-printable.c?h=WITH_LIBEFS'>e-util/e-printable.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: 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-printable.h?h=WITH_LIBEFS'>e-util/e-printable.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.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-setup.c?h=WITH_LIBEFS'>e-util/e-setup.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.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-setup.h?h=WITH_LIBEFS'>e-util/e-setup.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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>e-util/e-sexp.c</a></td><td class='right'>1165</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/e-util/e-sexp.h?h=WITH_LIBEFS'>e-util/e-sexp.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.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-text-event-processor-emacs-like.c?h=WITH_LIBEFS'>e-util/e-text-event-processor-emacs-like.c</a></td><td class='right'>372</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-text-event-processor-emacs-like.h?h=WITH_LIBEFS'>e-util/e-text-event-processor-emacs-like.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.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-text-event-processor-types.h?h=WITH_LIBEFS'>e-util/e-text-event-processor-types.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.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-text-event-processor.c?h=WITH_LIBEFS'>e-util/e-text-event-processor.c</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.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-text-event-processor.h?h=WITH_LIBEFS'>e-util/e-text-event-processor.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.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-util.c?h=WITH_LIBEFS'>e-util/e-util.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: 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-util.c-8611?h=WITH_LIBEFS'>e-util/e-util.c-8611</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: 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-util.h?h=WITH_LIBEFS'>e-util/e-util.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.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-util.h-29002?h=WITH_LIBEFS'>e-util/e-util.h-29002</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.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-xml-utils.c?h=WITH_LIBEFS'>e-util/e-xml-utils.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.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-xml-utils.c-56826?h=WITH_LIBEFS'>e-util/e-xml-utils.c-56826</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.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-xml-utils.h?h=WITH_LIBEFS'>e-util/e-xml-utils.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.2%;'/><td class='none' style='width: 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-xml-utils.h-82548?h=WITH_LIBEFS'>e-util/e-xml-utils.h-82548</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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=WITH_LIBEFS'>e-util/ename/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.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/ename/TODO?h=WITH_LIBEFS'>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-name-western-tables.h?h=WITH_LIBEFS'>e-util/ename/e-name-western-tables.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.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/ename/e-name-western.c?h=WITH_LIBEFS'>e-util/ename/e-name-western.c</a></td><td class='right'>868</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/e-util/ename/e-name-western.h?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/test-ename-western-gtk.c?h=WITH_LIBEFS'>e-util/ename/test-ename-western-gtk.c</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.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/ename/test-ename-western.c?h=WITH_LIBEFS'>e-util/ename/test-ename-western.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.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/evolution.desktop?h=WITH_LIBEFS'>evolution.desktop</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/evolution.png?h=WITH_LIBEFS'>evolution.png</a></td><td class='right'>bin</td><td class='graph'>4281 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/evolution.spec.in?h=WITH_LIBEFS'>evolution.spec.in</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.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/.cvsignore?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/ChangeLog?h=WITH_LIBEFS'>filter/ChangeLog</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: 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/Makefile.am?h=WITH_LIBEFS'>filter/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.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/filter/blank.xpm?h=WITH_LIBEFS'>filter/blank.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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/check.xpm?h=WITH_LIBEFS'>filter/check.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/filter/filter-arg-types.c?h=WITH_LIBEFS'>filter/filter-arg-types.c</a></td><td class='right'>754</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/filter/filter-arg-types.h?h=WITH_LIBEFS'>filter/filter-arg-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.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-arg.c?h=WITH_LIBEFS'>filter/filter-arg.c</a></td><td class='right'>563</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/filter/filter-arg.h?h=WITH_LIBEFS'>filter/filter-arg.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.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-driver.c?h=WITH_LIBEFS'>filter/filter-driver.c</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: 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/filter/filter-driver.h?h=WITH_LIBEFS'>filter/filter-driver.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.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-druid.c?h=WITH_LIBEFS'>filter/filter-druid.c</a></td><td class='right'>751</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/filter/filter-druid.h?h=WITH_LIBEFS'>filter/filter-druid.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.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.c?h=WITH_LIBEFS'>filter/filter-editor.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: 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/filter/filter-editor.h?h=WITH_LIBEFS'>filter/filter-editor.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.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-format.c?h=WITH_LIBEFS'>filter/filter-format.c</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: 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/filter/filter-format.h?h=WITH_LIBEFS'>filter/filter-format.h</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.1%;'/><td class='none' style='width: 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-xml.c?h=WITH_LIBEFS'>filter/filter-xml.c</a></td><td class='right'>580</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/filter/filter-xml.h?h=WITH_LIBEFS'>filter/filter-xml.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.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/filtertypes.xml?h=WITH_LIBEFS'>filter/filtertypes.xml</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.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/vfoldertypes.xml?h=WITH_LIBEFS'>filter/vfoldertypes.xml</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.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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>help/C/.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/help/C/Makefile.am?h=WITH_LIBEFS'>help/C/Makefile.am</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.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/apx-authors.sgml?h=WITH_LIBEFS'>help/C/apx-authors.sgml</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.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/C/apx-bugs.sgml?h=WITH_LIBEFS'>help/C/apx-bugs.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.1%;'/><td class='none' style='width: 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-fdl.sgml?h=WITH_LIBEFS'>help/C/apx-fdl.sgml</a></td><td class='right'>678</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/help/C/apx-gloss.sgml?h=WITH_LIBEFS'>help/C/apx-gloss.sgml</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: 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/config-prefs.sgml?h=WITH_LIBEFS'>help/C/config-prefs.sgml</a></td><td class='right'>496</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/C/config-setupassist.sgml?h=WITH_LIBEFS'>help/C/config-setupassist.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.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/config-sync.sgml?h=WITH_LIBEFS'>help/C/config-sync.sgml</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.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/C/devel-action.sgml?h=WITH_LIBEFS'>help/C/devel-action.sgml</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.1%;'/><td class='none' style='width: 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/devel-component.sgml?h=WITH_LIBEFS'>help/C/devel-component.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/help/C/devel-script.sgml?h=WITH_LIBEFS'>help/C/devel-script.sgml</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.1%;'/><td class='none' style='width: 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/evolution-guide.sgml?h=WITH_LIBEFS'>help/C/evolution-guide.sgml</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.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/C/fig/calendar.png?h=WITH_LIBEFS'>help/C/fig/calendar.png</a></td><td class='right'>bin</td><td class='graph'>30522 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/config-cal.png?h=WITH_LIBEFS'>help/C/fig/config-cal.png</a></td><td class='right'>bin</td><td class='graph'>12762 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/config-mail.png?h=WITH_LIBEFS'>help/C/fig/config-mail.png</a></td><td class='right'>bin</td><td class='graph'>5344 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/contact.png?h=WITH_LIBEFS'>help/C/fig/contact.png</a></td><td class='right'>bin</td><td class='graph'>27473 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/filter-new-fig.png?h=WITH_LIBEFS'>help/C/fig/filter-new-fig.png</a></td><td class='right'>bin</td><td class='graph'>7393 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/mail-druid-pic.png?h=WITH_LIBEFS'>help/C/fig/mail-druid-pic.png</a></td><td class='right'>bin</td><td class='graph'>35959 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/mainwindow-pic.png?h=WITH_LIBEFS'>help/C/fig/mainwindow-pic.png</a></td><td class='right'>bin</td><td class='graph'>261494 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/vfolder-createrule-fig.png?h=WITH_LIBEFS'>help/C/fig/vfolder-createrule-fig.png</a></td><td class='right'>bin</td><td class='graph'>7324 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/preface.sgml?h=WITH_LIBEFS'>help/C/preface.sgml</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.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/C/usage-calendar.sgml?h=WITH_LIBEFS'>help/C/usage-calendar.sgml</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: 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/C/usage-contact.sgml?h=WITH_LIBEFS'>help/C/usage-contact.sgml</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: 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/usage-mail.sgml?h=WITH_LIBEFS'>help/C/usage-mail.sgml</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: 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/C/usage-mainwindow.sgml?h=WITH_LIBEFS'>help/C/usage-mainwindow.sgml</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: 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/C/usage-sync.sgml?h=WITH_LIBEFS'>help/C/usage-sync.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.1%;'/><td class='none' style='width: 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/Camel-Classes?h=WITH_LIBEFS'>help/Camel-Classes</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.2%;'/><td class='none' style='width: 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/ChangeLog?h=WITH_LIBEFS'>help/ChangeLog</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: 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/help/Design?h=WITH_LIBEFS'>help/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: 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/Makefile.am?h=WITH_LIBEFS'>help/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/help/white-papers/calendar/calendar.sgml?h=WITH_LIBEFS'>help/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: 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/help/white-papers/mail/camel.sgml?h=WITH_LIBEFS'>help/white-papers/mail/camel.sgml</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: 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/white-papers/mail/ibex.sgml?h=WITH_LIBEFS'>help/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.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/white-papers/widgets/e-table.sgml?h=WITH_LIBEFS'>help/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: 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/libibex/.cvsignore?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/COPYING.LIB?h=WITH_LIBEFS'>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: 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/libibex/ChangeLog?h=WITH_LIBEFS'>libibex/ChangeLog</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.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/libibex/Makefile.am?h=WITH_LIBEFS'>libibex/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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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.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/file.c?h=WITH_LIBEFS'>libibex/file.c</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: 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/libibex/find.c?h=WITH_LIBEFS'>libibex/find.c</a></td><td class='right'>198</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/ibex.h?h=WITH_LIBEFS'>libibex/ibex.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.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/ibex_internal.h?h=WITH_LIBEFS'>libibex/ibex_internal.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.2%;'/><td class='none' style='width: 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.c?h=WITH_LIBEFS'>libibex/index.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.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/libibex/lookup.c?h=WITH_LIBEFS'>libibex/lookup.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.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/libibex/mkindex.c?h=WITH_LIBEFS'>libibex/mkindex.c</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.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/libibex/words.c?h=WITH_LIBEFS'>libibex/words.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: 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/.cvsignore?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/AUTHORS?h=WITH_LIBEFS'>libical/AUTHORS</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/CHANGES?h=WITH_LIBEFS'>libical/CHANGES</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: 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/libical/COPYING?h=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/ChangeLog</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.2%;'/><td class='none' style='width: 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/INSTALL?h=WITH_LIBEFS'>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/MacOS/errno.h?h=WITH_LIBEFS'>libical/MacOS/errno.h</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: 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/MacOS/libical.mcp?h=WITH_LIBEFS'>libical/MacOS/libical.mcp</a></td><td class='right'>bin</td><td class='graph'>139917 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/MacOS/libical.mcp.exp?h=WITH_LIBEFS'>libical/MacOS/libical.mcp.exp</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/MacOS/libical_prefix.h?h=WITH_LIBEFS'>libical/MacOS/libical_prefix.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/libical/MacOS/restrictions.make?h=WITH_LIBEFS'>libical/MacOS/restrictions.make</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/MacOS/restrictions.script?h=WITH_LIBEFS'>libical/MacOS/restrictions.script</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/MacOS/strdup.c?h=WITH_LIBEFS'>libical/MacOS/strdup.c</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.1%;'/><td class='none' style='width: 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/MacOS/strdup.h?h=WITH_LIBEFS'>libical/MacOS/strdup.h</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/libical/Makefile.am?h=WITH_LIBEFS'>libical/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.1%;'/><td class='none' style='width: 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/NEWS?h=WITH_LIBEFS'>libical/NEWS</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: 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/README?h=WITH_LIBEFS'>libical/README</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.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/TEST?h=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/THANKS</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>libical/TODO</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.2%;'/><td class='none' style='width: 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/acconfig.h?h=WITH_LIBEFS'>libical/acconfig.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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/autogen.sh?h=WITH_LIBEFS'>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.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/configure.in?h=WITH_LIBEFS'>libical/configure.in</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.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/configure.scan?h=WITH_LIBEFS'>libical/configure.scan</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/design-data/Makefile.am</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.1%;'/><td class='none' style='width: 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/components.txt?h=WITH_LIBEFS'>libical/design-data/components.txt</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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/params-in-prop.txt?h=WITH_LIBEFS'>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.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/design-data/prop-to-value.txt?h=WITH_LIBEFS'>libical/design-data/prop-to-value.txt</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.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/design-data/property-tokens.txt?h=WITH_LIBEFS'>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.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/design-data/restrictions.csv?h=WITH_LIBEFS'>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: 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/libical/design-data/status-new.txt?h=WITH_LIBEFS'>libical/design-data/status-new.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.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/design-data/status.foo?h=WITH_LIBEFS'>libical/design-data/status.foo</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.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/design-data/status.txt?h=WITH_LIBEFS'>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.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/design-data/value-c-types.txt?h=WITH_LIBEFS'>libical/design-data/value-c-types.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/value-mem-semantics.txt?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/doc/UsingLibical.lyx</a></td><td class='right'>2256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.7%;'/><td class='none' style='width: 87.3%;'/></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=WITH_LIBEFS'>libical/doc/UsingLibical.ps</a></td><td class='right'>1308</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/libical/doc/UsingLibical.sgml?h=WITH_LIBEFS'>libical/doc/UsingLibical.sgml</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: 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/doc/UsingLibical.txt?h=WITH_LIBEFS'>libical/doc/UsingLibical.txt</a></td><td class='right'>302</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/install-sh?h=WITH_LIBEFS'>libical/install-sh</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.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/missing?h=WITH_LIBEFS'>libical/missing</a></td><td class='right'>190</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/mkinstalldirs?h=WITH_LIBEFS'>libical/mkinstalldirs</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/scripts/Makefile.am</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedcomponents.pl?h=WITH_LIBEFS'>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: 1.0%;'/><td class='none' style='width: 99.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/mkderivedparameters.pl?h=WITH_LIBEFS'>libical/scripts/mkderivedparameters.pl</a></td><td class='right'>277</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedproperties.pl?h=WITH_LIBEFS'>libical/scripts/mkderivedproperties.pl</a></td><td class='right'>290</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedvalues.pl?h=WITH_LIBEFS'>libical/scripts/mkderivedvalues.pl</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: 1.7%;'/><td class='none' style='width: 98.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/mkparameterrestrictions.pl?h=WITH_LIBEFS'>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.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/mkrestrictionrecords.pl?h=WITH_LIBEFS'>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.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/mkrestrictiontable.pl?h=WITH_LIBEFS'>libical/scripts/mkrestrictiontable.pl</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.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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/src/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/src/libical/.cvsignore?h=WITH_LIBEFS'>libical/src/libical/.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.1%;'/><td class='none' style='width: 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/.gdb_history?h=WITH_LIBEFS'>libical/src/libical/.gdb_history</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: 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/.gdbinit?h=WITH_LIBEFS'>libical/src/libical/.gdbinit</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/libical/src/libical/Makefile.am?h=WITH_LIBEFS'>libical/src/libical/Makefile.am</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.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/base64.c?h=WITH_LIBEFS'>libical/src/libical/base64.c</a></td><td class='right'>323</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/filelock.c?h=WITH_LIBEFS'>libical/src/libical/filelock.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.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/filelock.h?h=WITH_LIBEFS'>libical/src/libical/filelock.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.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/foo?h=WITH_LIBEFS'>libical/src/libical/foo</a></td><td class='right'>1578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.9%;'/><td class='none' style='width: 91.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/ical.h?h=WITH_LIBEFS'>libical/src/libical/ical.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>libical/src/libical/icalcomponent.c</a></td><td class='right'>782</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/libical/src/libical/icalcomponent.h?h=WITH_LIBEFS'>libical/src/libical/icalcomponent.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.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/icalenums.c?h=WITH_LIBEFS'>libical/src/libical/icalenums.c</a></td><td class='right'>615</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/libical/src/libical/icalenums.h?h=WITH_LIBEFS'>libical/src/libical/icalenums.h</a></td><td class='right'>466</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/icalerror.c?h=WITH_LIBEFS'>libical/src/libical/icalerror.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.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/icalerror.h?h=WITH_LIBEFS'>libical/src/libical/icalerror.h</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.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/icalirip.h?h=WITH_LIBEFS'>libical/src/libical/icalirip.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.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/icalitip.output?h=WITH_LIBEFS'>libical/src/libical/icalitip.output</a></td><td class='right'>1698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.6%;'/><td class='none' style='width: 90.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/icalitip.tab.c?h=WITH_LIBEFS'>libical/src/libical/icalitip.tab.c</a></td><td class='right'>1663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 90.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/icalitip.tab.h?h=WITH_LIBEFS'>libical/src/libical/icalitip.tab.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.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/icalitipl.l?h=WITH_LIBEFS'>libical/src/libical/icalitipl.l</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: 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/libical/icalitipy.y?h=WITH_LIBEFS'>libical/src/libical/icalitipy.y</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: 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/libical/src/libical/icallexer.c?h=WITH_LIBEFS'>libical/src/libical/icallexer.c</a></td><td class='right'>2179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.3%;'/><td class='none' style='width: 87.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/icallexer.l?h=WITH_LIBEFS'>libical/src/libical/icallexer.l</a></td><td class='right'>286</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/libical/icalmemory.c?h=WITH_LIBEFS'>libical/src/libical/icalmemory.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: 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/libical/src/libical/icalmemory.h?h=WITH_LIBEFS'>libical/src/libical/icalmemory.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.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/icalparameter.c?h=WITH_LIBEFS'>libical/src/libical/icalparameter.c</a></td><td class='right'>1913</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.8%;'/><td class='none' style='width: 89.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/icalparameter.h?h=WITH_LIBEFS'>libical/src/libical/icalparameter.h</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: 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/icalparser.c?h=WITH_LIBEFS'>libical/src/libical/icalparser.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: 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/libical/src/libical/icalparser.h?h=WITH_LIBEFS'>libical/src/libical/icalparser.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.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/icalproperty.c?h=WITH_LIBEFS'>libical/src/libical/icalproperty.c</a></td><td class='right'>3095</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 82.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/icalproperty.h?h=WITH_LIBEFS'>libical/src/libical/icalproperty.h</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: 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/icalrestriction.c?h=WITH_LIBEFS'>libical/src/libical/icalrestriction.c</a></td><td class='right'>1600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 91.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=WITH_LIBEFS'>libical/src/libical/icalrestriction.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.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/icaltypes.c?h=WITH_LIBEFS'>libical/src/libical/icaltypes.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: 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/icaltypes.h?h=WITH_LIBEFS'>libical/src/libical/icaltypes.h</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: 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/icalvalue.c?h=WITH_LIBEFS'>libical/src/libical/icalvalue.c</a></td><td class='right'>2104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.9%;'/><td class='none' style='width: 88.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=WITH_LIBEFS'>libical/src/libical/icalvalue.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: 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/icalvcal.h?h=WITH_LIBEFS'>libical/src/libical/icalvcal.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.2%;'/><td class='none' style='width: 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/icalversion.h.in?h=WITH_LIBEFS'>libical/src/libical/icalversion.h.in</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/libical/src/libical/icalyacc.c?h=WITH_LIBEFS'>libical/src/libical/icalyacc.c</a></td><td class='right'>1706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.6%;'/><td class='none' style='width: 90.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/icalyacc.h?h=WITH_LIBEFS'>libical/src/libical/icalyacc.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: 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/icalyacc.y?h=WITH_LIBEFS'>libical/src/libical/icalyacc.y</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: 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/libical/src/libical/locking.c?h=WITH_LIBEFS'>libical/src/libical/locking.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.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/pvl.c?h=WITH_LIBEFS'>libical/src/libical/pvl.c</a></td><td class='right'>768</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/libical/src/libical/pvl.h?h=WITH_LIBEFS'>libical/src/libical/pvl.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.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/testlocks.c?h=WITH_LIBEFS'>libical/src/libical/testlocks.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.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=WITH_LIBEFS'>libical/src/libicalss/.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/libical/src/libicalss/Makefile.am?h=WITH_LIBEFS'>libical/src/libicalss/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/libicalss/icalcalendar.c?h=WITH_LIBEFS'>libical/src/libicalss/icalcalendar.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: 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/icalcalendar.h?h=WITH_LIBEFS'>libical/src/libicalss/icalcalendar.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.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/icalcluster.c?h=WITH_LIBEFS'>libical/src/libicalss/icalcluster.c</a></td><td class='right'>423</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/libical/src/libicalss/icalcluster.h?h=WITH_LIBEFS'>libical/src/libicalss/icalcluster.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.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/icalcomponent.h?h=WITH_LIBEFS'>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.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/icalstore.c?h=WITH_LIBEFS'>libical/src/libicalss/icalstore.c</a></td><td class='right'>858</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/libical/src/libicalss/icalstore.h?h=WITH_LIBEFS'>libical/src/libicalss/icalstore.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.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/pvl/Makefile?h=WITH_LIBEFS'>libical/src/pvl/Makefile</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/src/test/.cvsignore?h=WITH_LIBEFS'>libical/src/test/.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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>libical/src/test/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.1%;'/><td class='none' style='width: 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/Makefile.in?h=WITH_LIBEFS'>libical/src/test/Makefile.in</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: 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/alice/booked/199706?h=WITH_LIBEFS'>libical/src/test/alice/booked/199706</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: 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/test/alice/booked/199707?h=WITH_LIBEFS'>libical/src/test/alice/booked/199707</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: 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/libical/src/test/alice/booked/199708?h=WITH_LIBEFS'>libical/src/test/alice/booked/199708</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.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/alice/booked/199709?h=WITH_LIBEFS'>libical/src/test/alice/booked/199709</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.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/alice/booked/199803?h=WITH_LIBEFS'>libical/src/test/alice/booked/199803</a></td><td class='right'>241</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/libical/src/test/alice/incoming.ics?h=WITH_LIBEFS'>libical/src/test/alice/incoming.ics</a></td><td class='right'>2164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.2%;'/><td class='none' style='width: 87.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/copycluster.c?h=WITH_LIBEFS'>libical/src/test/copycluster.c</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.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/test/findobj.c?h=WITH_LIBEFS'>libical/src/test/findobj.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.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/icaltestparser.c?h=WITH_LIBEFS'>libical/src/test/icaltestparser.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.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/test/regression.c?h=WITH_LIBEFS'>libical/src/test/regression.c</a></td><td class='right'>1334</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/libical/src/test/storage.c?h=WITH_LIBEFS'>libical/src/test/storage.c</a></td><td class='right'>460</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/test/stow.c?h=WITH_LIBEFS'>libical/src/test/stow.c</a></td><td class='right'>533</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/libical/src/test/test-component.icd?h=WITH_LIBEFS'>libical/src/test/test-component.icd</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/test/usecases.c?h=WITH_LIBEFS'>libical/src/test/usecases.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: 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/test-data/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/test-data/0</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.1%;'/><td class='none' style='width: 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?h=WITH_LIBEFS'>libical/test-data/1</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.2%;'/><td class='none' style='width: 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/1.1?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/2?h=WITH_LIBEFS'>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=WITH_LIBEFS'>libical/test-data/2445.ics</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: 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/test-data/2445.vcd?h=WITH_LIBEFS'>libical/test-data/2445.vcd</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: 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/test-data/2446.ics?h=WITH_LIBEFS'>libical/test-data/2446.ics</a></td><td class='right'>998</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/libical/test-data/2446.vcd?h=WITH_LIBEFS'>libical/test-data/2446.vcd</a></td><td class='right'>1007</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/libical/test-data/3?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/4?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/6?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/7?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>libical/test-data/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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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.vcd?h=WITH_LIBEFS'>libical/test-data/smallcluster.vcd</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.1%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>libversit/.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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>libversit/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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>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: 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/libversit/port.h?h=WITH_LIBEFS'>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.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/libversit/vcaltest.c?h=WITH_LIBEFS'>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.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/libversit/vcaltmp.c?h=WITH_LIBEFS'>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: 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/libversit/vcaltmp.h?h=WITH_LIBEFS'>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.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/libversit/vcc.h?h=WITH_LIBEFS'>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.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/libversit/vcc.y?h=WITH_LIBEFS'>libversit/vcc.y</a></td><td class='right'>1257</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/libversit/vctest.c?h=WITH_LIBEFS'>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.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/libversit/vobject.c?h=WITH_LIBEFS'>libversit/vobject.c</a></td><td class='right'>1452</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/libversit/vobject.h?h=WITH_LIBEFS'>libversit/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: 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/.cvsignore?h=WITH_LIBEFS'>mail/.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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>mail/ChangeLog</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: 9.4%;'/><td class='none' style='width: 90.6%;'/></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=WITH_LIBEFS'>mail/GNOME_Evolution_Mail.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.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/GNOME_Evolution_Mail.oafinfo?h=WITH_LIBEFS'>mail/GNOME_Evolution_Mail.oafinfo</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.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.idl?h=WITH_LIBEFS'>mail/Mail.idl</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>mail/Makefile.am</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.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/component-factory.c?h=WITH_LIBEFS'>mail/component-factory.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: 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/mail/component-factory.h?h=WITH_LIBEFS'>mail/component-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.2%;'/><td class='none' style='width: 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/e-attchmt.png?h=WITH_LIBEFS'>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/evolution-mail.gnorba?h=WITH_LIBEFS'>mail/evolution-mail.gnorba</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/evolution-mail.oafinfo?h=WITH_LIBEFS'>mail/evolution-mail.oafinfo</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.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-factory.c?h=WITH_LIBEFS'>mail/folder-browser-factory.c</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: 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/mail/folder-browser.c?h=WITH_LIBEFS'>mail/folder-browser.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: 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/mail/folder-browser.h?h=WITH_LIBEFS'>mail/folder-browser.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.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-config.c?h=WITH_LIBEFS'>mail/mail-config.c</a></td><td class='right'>2129</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/mail/mail-display.c?h=WITH_LIBEFS'>mail/mail-display.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: 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/mail/mail-display.h?h=WITH_LIBEFS'>mail/mail-display.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.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-format.c?h=WITH_LIBEFS'>mail/mail-format.c</a></td><td class='right'>1468</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/mail/mail-identify.c?h=WITH_LIBEFS'>mail/mail-identify.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.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/mail-ops.c?h=WITH_LIBEFS'>mail/mail-ops.c</a></td><td class='right'>796</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/mail/mail-threads.c?h=WITH_LIBEFS'>mail/mail-threads.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: 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/mail/mail-threads.h?h=WITH_LIBEFS'>mail/mail-threads.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.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-types.h?h=WITH_LIBEFS'>mail/mail-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.2%;'/><td class='none' style='width: 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.h?h=WITH_LIBEFS'>mail/mail.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.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/main.c?h=WITH_LIBEFS'>mail/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.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/message-list.c?h=WITH_LIBEFS'>mail/message-list.c</a></td><td class='right'>1024</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/message-list.h?h=WITH_LIBEFS'>mail/message-list.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.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/pixmaps.h?h=WITH_LIBEFS'>mail/pixmaps.h</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.1%;'/><td class='none' style='width: 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/pixmaps/attachment-header.xpm?h=WITH_LIBEFS'>mail/pixmaps/attachment-header.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/mail/pixmaps/attachment.xpm?h=WITH_LIBEFS'>mail/pixmaps/attachment.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.1%;'/><td class='none' style='width: 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/pixmaps/empty.xpm?h=WITH_LIBEFS'>mail/pixmaps/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.1%;'/><td class='none' style='width: 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/pixmaps/envelope-closed.xpm?h=WITH_LIBEFS'>mail/pixmaps/envelope-closed.xpm</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.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/pixmaps/envelope-deleted.xpm?h=WITH_LIBEFS'>mail/pixmaps/envelope-deleted.xpm</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.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/pixmaps/envelope-opened.xpm?h=WITH_LIBEFS'>mail/pixmaps/envelope-opened.xpm</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.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/pixmaps/message-status.xpm?h=WITH_LIBEFS'>mail/pixmaps/message-status.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/mail/pixmaps/online-status.xpm?h=WITH_LIBEFS'>mail/pixmaps/online-status.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/mail/session.c?h=WITH_LIBEFS'>mail/session.c</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.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/test-mail.c?h=WITH_LIBEFS'>mail/test-mail.c</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.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/test-thread.c?h=WITH_LIBEFS'>mail/test-thread.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.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/notes/.cvsignore?h=WITH_LIBEFS'>notes/.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/notes/GNOME_Evolution_Notes.oaf.in?h=WITH_LIBEFS'>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.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/notes/GNOME_Evolution_Notes.oafinfo?h=WITH_LIBEFS'>notes/GNOME_Evolution_Notes.oafinfo</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.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/notes/Makefile.am?h=WITH_LIBEFS'>notes/Makefile.am</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.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/notes/component-factory.c?h=WITH_LIBEFS'>notes/component-factory.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.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/notes/component-factory.h?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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: 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/notes/e-bevel-button-util.h?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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-bevel-button.c?h=WITH_LIBEFS'>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: 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/notes/e-bevel-button.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 99.8%;'/></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=WITH_LIBEFS'>notes/e-note.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: 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/notes/e-note.h?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/evolution-notes.oafinfo?h=WITH_LIBEFS'>notes/evolution-notes.oafinfo</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.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/notes/main.c?h=WITH_LIBEFS'>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.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/notes/test-notes.c?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 99.8%;'/></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=WITH_LIBEFS'>po/.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.1%;'/><td class='none' style='width: 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/ChangeLog?h=WITH_LIBEFS'>po/ChangeLog</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: 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/po/POTFILES.in?h=WITH_LIBEFS'>po/POTFILES.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.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/README.tools?h=WITH_LIBEFS'>po/README.tools</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.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/da.po?h=WITH_LIBEFS'>po/da.po</a></td><td class='right'>2480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.0%;'/><td class='none' style='width: 86.0%;'/></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=WITH_LIBEFS'>po/de.po</a></td><td class='right'>475</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/desk.pl?h=WITH_LIBEFS'>po/desk.pl</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.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/po/el.po?h=WITH_LIBEFS'>po/el.po</a></td><td class='right'>1173</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/po/es.po?h=WITH_LIBEFS'>po/es.po</a></td><td class='right'>1036</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/po/flu-danish?h=WITH_LIBEFS'>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.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/po/fr.po?h=WITH_LIBEFS'>po/fr.po</a></td><td class='right'>1000</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/po/gl.po?h=WITH_LIBEFS'>po/gl.po</a></td><td class='right'>1042</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/po/hu.po?h=WITH_LIBEFS'>po/hu.po</a></td><td class='right'>1028</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/po/it.po?h=WITH_LIBEFS'>po/it.po</a></td><td class='right'>1058</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/po/ja.po?h=WITH_LIBEFS'>po/ja.po</a></td><td class='right'>2488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.0%;'/><td class='none' style='width: 86.0%;'/></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=WITH_LIBEFS'>po/ko.po</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: 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/po/nl.po?h=WITH_LIBEFS'>po/nl.po</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: 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/po/no.po?h=WITH_LIBEFS'>po/no.po</a></td><td class='right'>2511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.2%;'/><td class='none' style='width: 85.8%;'/></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=WITH_LIBEFS'>po/pl.po</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: 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/po/pt.po?h=WITH_LIBEFS'>po/pt.po</a></td><td class='right'>2556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.4%;'/><td class='none' style='width: 85.6%;'/></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=WITH_LIBEFS'>po/pt_BR.po</a></td><td class='right'>1047</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/po/ru.po?h=WITH_LIBEFS'>po/ru.po</a></td><td class='right'>2467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.9%;'/><td class='none' style='width: 86.1%;'/></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=WITH_LIBEFS'>po/sl.po</a></td><td class='right'>1057</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/po/sv.po?h=WITH_LIBEFS'>po/sv.po</a></td><td class='right'>1201</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/po/tr.po?h=WITH_LIBEFS'>po/tr.po</a></td><td class='right'>2488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.0%;'/><td class='none' style='width: 86.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=WITH_LIBEFS'>po/uk.po</a></td><td class='right'>1035</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/update.pl?h=WITH_LIBEFS'>po/update.pl</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.9%;'/><td class='none' style='width: 99.1%;'/></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=WITH_LIBEFS'>po/update.sh</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.2%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>shell/.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.1%;'/><td class='none' style='width: 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/ChangeLog?h=WITH_LIBEFS'>shell/ChangeLog</a></td><td class='right'>1405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.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.idl?h=WITH_LIBEFS'>shell/Evolution-Shell.idl</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.2%;'/><td class='none' style='width: 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-ShellComponent.idl?h=WITH_LIBEFS'>shell/Evolution-ShellComponent.idl</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.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-Storage.idl?h=WITH_LIBEFS'>shell/Evolution-Storage.idl</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.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.idl?h=WITH_LIBEFS'>shell/Evolution.idl</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>shell/Makefile.am</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.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-registry.c?h=WITH_LIBEFS'>shell/e-component-registry.c</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: 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/shell/e-component-registry.h?h=WITH_LIBEFS'>shell/e-component-registry.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.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-corba-storage-registry.c?h=WITH_LIBEFS'>shell/e-corba-storage-registry.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: 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-registry.h?h=WITH_LIBEFS'>shell/e-corba-storage-registry.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.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-corba-storage.c?h=WITH_LIBEFS'>shell/e-corba-storage.c</a></td><td class='right'>354</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-corba-storage.h?h=WITH_LIBEFS'>shell/e-corba-storage.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.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-folder-type-registry.c?h=WITH_LIBEFS'>shell/e-folder-type-registry.c</a></td><td class='right'>365</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-folder-type-registry.h?h=WITH_LIBEFS'>shell/e-folder-type-registry.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.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-folder.c?h=WITH_LIBEFS'>shell/e-folder.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: 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-folder.h?h=WITH_LIBEFS'>shell/e-folder.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.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-init.c?h=WITH_LIBEFS'>shell/e-init.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.2%;'/><td class='none' style='width: 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-init.h?h=WITH_LIBEFS'>shell/e-init.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/shell/e-local-folder.c?h=WITH_LIBEFS'>shell/e-local-folder.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: 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/e-local-folder.h?h=WITH_LIBEFS'>shell/e-local-folder.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.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-local-storage.c?h=WITH_LIBEFS'>shell/e-local-storage.c</a></td><td class='right'>589</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/shell/e-local-storage.h?h=WITH_LIBEFS'>shell/e-local-storage.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.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-setup.c?h=WITH_LIBEFS'>shell/e-setup.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.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-setup.h?h=WITH_LIBEFS'>shell/e-setup.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.2%;'/><td class='none' style='width: 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-constants.h?h=WITH_LIBEFS'>shell/e-shell-constants.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.2%;'/><td class='none' style='width: 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-creation-dialog.c?h=WITH_LIBEFS'>shell/e-shell-folder-creation-dialog.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: 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/shell/e-shell-folder-creation-dialog.h?h=WITH_LIBEFS'>shell/e-shell-folder-creation-dialog.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.2%;'/><td class='none' style='width: 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-selection-dialog.c?h=WITH_LIBEFS'>shell/e-shell-folder-selection-dialog.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: 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-folder-selection-dialog.h?h=WITH_LIBEFS'>shell/e-shell-folder-selection-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.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-folder-title-bar.c?h=WITH_LIBEFS'>shell/e-shell-folder-title-bar.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: 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-folder-title-bar.h?h=WITH_LIBEFS'>shell/e-shell-folder-title-bar.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.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-utils.c?h=WITH_LIBEFS'>shell/e-shell-utils.c</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.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-shell-utils.h?h=WITH_LIBEFS'>shell/e-shell-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.2%;'/><td class='none' style='width: 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-view-menu.c?h=WITH_LIBEFS'>shell/e-shell-view-menu.c</a></td><td class='right'>518</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/shell/e-shell-view-menu.h?h=WITH_LIBEFS'>shell/e-shell-view-menu.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.2%;'/><td class='none' style='width: 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-view.c?h=WITH_LIBEFS'>shell/e-shell-view.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: 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/shell/e-shell-view.h?h=WITH_LIBEFS'>shell/e-shell-view.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.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-shell.c?h=WITH_LIBEFS'>shell/e-shell.c</a></td><td class='right'>593</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/shell/e-shell.h?h=WITH_LIBEFS'>shell/e-shell.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.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-shortcut.c?h=WITH_LIBEFS'>shell/e-shortcut.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: 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-shortcut.h?h=WITH_LIBEFS'>shell/e-shortcut.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.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-shortcuts-view.c?h=WITH_LIBEFS'>shell/e-shortcuts-view.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: 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/shell/e-shortcuts-view.h?h=WITH_LIBEFS'>shell/e-shortcuts-view.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.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.c?h=WITH_LIBEFS'>shell/e-shortcuts.c</a></td><td class='right'>760</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/shell/e-shortcuts.h?h=WITH_LIBEFS'>shell/e-shortcuts.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.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-storage-set-view.c?h=WITH_LIBEFS'>shell/e-storage-set-view.c</a></td><td class='right'>891</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-storage-set-view.h?h=WITH_LIBEFS'>shell/e-storage-set-view.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.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-storage-set.c?h=WITH_LIBEFS'>shell/e-storage-set.c</a></td><td class='right'>527</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/shell/e-storage-set.h?h=WITH_LIBEFS'>shell/e-storage-set.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.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-storage.c?h=WITH_LIBEFS'>shell/e-storage.c</a></td><td class='right'>523</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/shell/e-storage.h?h=WITH_LIBEFS'>shell/e-storage.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.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-component-client.c?h=WITH_LIBEFS'>shell/evolution-shell-component-client.c</a></td><td class='right'>518</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/shell/evolution-shell-component-client.h?h=WITH_LIBEFS'>shell/evolution-shell-component-client.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.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-component.c?h=WITH_LIBEFS'>shell/evolution-shell-component.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: 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/shell/evolution-shell-component.h?h=WITH_LIBEFS'>shell/evolution-shell-component.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.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-storage.c?h=WITH_LIBEFS'>shell/evolution-storage.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: 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/shell/evolution-storage.h?h=WITH_LIBEFS'>shell/evolution-storage.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.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/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>shell/glade/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/shell/glade/e-shell-folder-creation-dialog.glade?h=WITH_LIBEFS'>shell/glade/e-shell-folder-creation-dialog.glade</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.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/idl/folder.idl?h=WITH_LIBEFS'>shell/idl/folder.idl</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.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/main.c?h=WITH_LIBEFS'>shell/main.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: 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/stamp.h.in?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>tests/Makefile.am</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.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-movemail.c?h=WITH_LIBEFS'>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.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/tests/test-url.c?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/test1.c?h=WITH_LIBEFS'>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.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/tests/test10.c?h=WITH_LIBEFS'>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.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/tests/test11.c?h=WITH_LIBEFS'>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.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/tests/test12.c?h=WITH_LIBEFS'>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.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/test13.c?h=WITH_LIBEFS'>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.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/tests/test14.c?h=WITH_LIBEFS'>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: 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/test2.c?h=WITH_LIBEFS'>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.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/test3.c?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/test4.c?h=WITH_LIBEFS'>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.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/test5.c?h=WITH_LIBEFS'>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.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/test6.c?h=WITH_LIBEFS'>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.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/test8.c?h=WITH_LIBEFS'>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.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/test9.c?h=WITH_LIBEFS'>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.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/tests/ui-tests/.cvsignore?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/filter.c?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/filterdescription.xml?h=WITH_LIBEFS'>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.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/tests/ui-tests/mail-atchmt-image.msg?h=WITH_LIBEFS'>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.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/ui-tests/mail-atchmt-postscript.msg?h=WITH_LIBEFS'>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: 45.5%;'/><td class='none' style='width: 54.5%;'/></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=WITH_LIBEFS'>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: 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/tests/ui-tests/message-browser.c?h=WITH_LIBEFS'>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: 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/tests/ui-tests/saveoptions.xml?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/store_listing.c?h=WITH_LIBEFS'>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: 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/tests/ui-tests/store_listing.glade?h=WITH_LIBEFS'>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: 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/tests/ui-tests/test-multipart-alt.msg?h=WITH_LIBEFS'>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: 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/tests/ui-tests/test-multipart-mixed.msg?h=WITH_LIBEFS'>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: 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/tools/.cvsignore?h=WITH_LIBEFS'>tools/.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/tools/Makefile.am?h=WITH_LIBEFS'>tools/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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/killev?h=WITH_LIBEFS'>tools/killev</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.1%;'/><td class='none' style='width: 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/.cvsignore?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/LICENSE?h=WITH_LIBEFS'>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=WITH_LIBEFS'>widgets/Makefile.am</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/e-paned/.cvsignore?h=WITH_LIBEFS'>widgets/e-paned/.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/e-paned/Makefile.am?h=WITH_LIBEFS'>widgets/e-paned/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.1%;'/><td class='none' style='width: 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/e-paned/e-hpaned.c?h=WITH_LIBEFS'>widgets/e-paned/e-hpaned.c</a></td><td class='right'>437</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/e-paned/e-hpaned.h?h=WITH_LIBEFS'>widgets/e-paned/e-hpaned.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.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/e-paned/e-paned.c?h=WITH_LIBEFS'>widgets/e-paned/e-paned.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: 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/widgets/e-paned/e-paned.h?h=WITH_LIBEFS'>widgets/e-paned/e-paned.h</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.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/e-paned/e-vpaned.c?h=WITH_LIBEFS'>widgets/e-paned/e-vpaned.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: 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/e-paned/e-vpaned.h?h=WITH_LIBEFS'>widgets/e-paned/e-vpaned.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.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/e-reflow/e-reflow-sorted.c?h=WITH_LIBEFS'>widgets/e-reflow/e-reflow-sorted.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: 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/e-reflow/e-reflow-sorted.h?h=WITH_LIBEFS'>widgets/e-reflow/e-reflow-sorted.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.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/e-reflow/e-reflow.c?h=WITH_LIBEFS'>widgets/e-reflow/e-reflow.c</a></td><td class='right'>848</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/widgets/e-reflow/e-reflow.h?h=WITH_LIBEFS'>widgets/e-reflow/e-reflow.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.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-table/.cvsignore?h=WITH_LIBEFS'>widgets/e-table/.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.1%;'/><td class='none' style='width: 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/e-table/ChangeLog?h=WITH_LIBEFS'>widgets/e-table/ChangeLog</a></td><td class='right'>1997</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.3%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-table/LICENSE?h=WITH_LIBEFS'>widgets/e-table/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/e-table/Makefile.am?h=WITH_LIBEFS'>widgets/e-table/Makefile.am</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: 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/e-table/ROADMAP.e-table?h=WITH_LIBEFS'>widgets/e-table/ROADMAP.e-table</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.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-table/TODO?h=WITH_LIBEFS'>widgets/e-table/TODO</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.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-table/add-col.xpm?h=WITH_LIBEFS'>widgets/e-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/e-table/arrow-down.xpm?h=WITH_LIBEFS'>widgets/e-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.1%;'/><td class='none' style='width: 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/e-table/arrow-up.xpm?h=WITH_LIBEFS'>widgets/e-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.1%;'/><td class='none' style='width: 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/e-table/check-empty.xpm?h=WITH_LIBEFS'>widgets/e-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.1%;'/><td class='none' style='width: 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/e-table/check-filled.xpm?h=WITH_LIBEFS'>widgets/e-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.1%;'/><td class='none' style='width: 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/e-table/clip.png?h=WITH_LIBEFS'>widgets/e-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/e-table/e-cell-checkbox.c?h=WITH_LIBEFS'>widgets/e-table/e-cell-checkbox.c</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.2%;'/><td class='none' style='width: 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/e-table/e-cell-checkbox.h?h=WITH_LIBEFS'>widgets/e-table/e-cell-checkbox.h</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/widgets/e-table/e-cell-string.c?h=WITH_LIBEFS'>widgets/e-table/e-cell-string.c</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.1%;'/><td class='none' style='width: 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/e-table/e-cell-text.c?h=WITH_LIBEFS'>widgets/e-table/e-cell-text.c</a></td><td class='right'>2155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.1%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-table/e-cell-text.h?h=WITH_LIBEFS'>widgets/e-table/e-cell-text.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.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/e-table/e-cell-toggle.c?h=WITH_LIBEFS'>widgets/e-table/e-cell-toggle.c</a></td><td class='right'>299</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-table/e-cell-toggle.h?h=WITH_LIBEFS'>widgets/e-table/e-cell-toggle.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.2%;'/><td class='none' style='width: 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/e-table/e-cell-tree.c?h=WITH_LIBEFS'>widgets/e-table/e-cell-tree.c</a></td><td class='right'>546</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/e-table/e-cell-tree.h?h=WITH_LIBEFS'>widgets/e-table/e-cell-tree.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.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/e-table/e-cell.c?h=WITH_LIBEFS'>widgets/e-table/e-cell.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: 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/e-table/e-cell.h?h=WITH_LIBEFS'>widgets/e-table/e-cell.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.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/e-table/e-table-col-dnd.h?h=WITH_LIBEFS'>widgets/e-table/e-table-col-dnd.h</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.1%;'/><td class='none' style='width: 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/e-table/e-table-col.c?h=WITH_LIBEFS'>widgets/e-table/e-table-col.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.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/e-table/e-table-col.h?h=WITH_LIBEFS'>widgets/e-table/e-table-col.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.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/e-table/e-table-column-model.h?h=WITH_LIBEFS'>widgets/e-table/e-table-column-model.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/widgets/e-table/e-table-column.c?h=WITH_LIBEFS'>widgets/e-table/e-table-column.c</a></td><td class='right'>293</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-table/e-table-config.c?h=WITH_LIBEFS'>widgets/e-table/e-table-config.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: 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/e-table/e-table-config.glade?h=WITH_LIBEFS'>widgets/e-table/e-table-config.glade</a></td><td class='right'>302</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-table/e-table-config.glade.h?h=WITH_LIBEFS'>widgets/e-table/e-table-config.glade.h</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.1%;'/><td class='none' style='width: 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/e-table/e-table-config.h?h=WITH_LIBEFS'>widgets/e-table/e-table-config.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.1%;'/><td class='none' style='width: 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/e-table/e-table-defines.h?h=WITH_LIBEFS'>widgets/e-table/e-table-defines.h</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.1%;'/><td class='none' style='width: 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/e-table/e-table-example-1.c?h=WITH_LIBEFS'>widgets/e-table/e-table-example-1.c</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: 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/e-table/e-table-example-2.c?h=WITH_LIBEFS'>widgets/e-table/e-table-example-2.c</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: 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/e-table/e-table-field-chooser-dialog.c?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser-dialog.c</a></td><td class='right'>190</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/e-table/e-table-field-chooser-dialog.h?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser-dialog.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.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/e-table/e-table-field-chooser-item.c?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser-item.c</a></td><td class='right'>566</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/e-table/e-table-field-chooser-item.h?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser-item.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.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/e-table/e-table-field-chooser.c?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser.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: 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/e-table/e-table-field-chooser.glade?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser.glade</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.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/e-table/e-table-field-chooser.glade.h?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser.glade.h</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.1%;'/><td class='none' style='width: 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/e-table/e-table-field-chooser.h?h=WITH_LIBEFS'>widgets/e-table/e-table-field-chooser.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.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/e-table/e-table-group-container.c?h=WITH_LIBEFS'>widgets/e-table/e-table-group-container.c</a></td><td class='right'>1105</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/e-table/e-table-group-container.h?h=WITH_LIBEFS'>widgets/e-table/e-table-group-container.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.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/e-table/e-table-group-leaf.c?h=WITH_LIBEFS'>widgets/e-table/e-table-group-leaf.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: 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/widgets/e-table/e-table-group-leaf.h?h=WITH_LIBEFS'>widgets/e-table/e-table-group-leaf.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.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/e-table/e-table-group.c?h=WITH_LIBEFS'>widgets/e-table/e-table-group.c</a></td><td class='right'>420</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/widgets/e-table/e-table-group.glade?h=WITH_LIBEFS'>widgets/e-table/e-table-group.glade</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: 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/e-table/e-table-group.glade.h?h=WITH_LIBEFS'>widgets/e-table/e-table-group.glade.h</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.1%;'/><td class='none' style='width: 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/e-table/e-table-group.h?h=WITH_LIBEFS'>widgets/e-table/e-table-group.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.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/e-table/e-table-header-item.c?h=WITH_LIBEFS'>widgets/e-table/e-table-header-item.c</a></td><td class='right'>1423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 92.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-table/e-table-header-item.h?h=WITH_LIBEFS'>widgets/e-table/e-table-header-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.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/e-table/e-table-header.c?h=WITH_LIBEFS'>widgets/e-table/e-table-header.c</a></td><td class='right'>663</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/widgets/e-table/e-table-header.h?h=WITH_LIBEFS'>widgets/e-table/e-table-header.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.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/e-table/e-table-item.c?h=WITH_LIBEFS'>widgets/e-table/e-table-item.c</a></td><td class='right'>2027</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.4%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-table/e-table-item.h?h=WITH_LIBEFS'>widgets/e-table/e-table-item.h</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.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/e-table/e-table-model.c?h=WITH_LIBEFS'>widgets/e-table/e-table-model.c</a></td><td class='right'>281</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/e-table/e-table-model.h?h=WITH_LIBEFS'>widgets/e-table/e-table-model.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.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/e-table/e-table-simple.c?h=WITH_LIBEFS'>widgets/e-table/e-table-simple.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: 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/e-table/e-table-simple.h?h=WITH_LIBEFS'>widgets/e-table/e-table-simple.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.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/e-table/e-table-size-test.c?h=WITH_LIBEFS'>widgets/e-table/e-table-size-test.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: 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/e-table/e-table-sort-info.c?h=WITH_LIBEFS'>widgets/e-table/e-table-sort-info.c</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: 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/e-table/e-table-sort-info.h?h=WITH_LIBEFS'>widgets/e-table/e-table-sort-info.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.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/e-table/e-table-sorted-variable.c?h=WITH_LIBEFS'>widgets/e-table/e-table-sorted-variable.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: 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/e-table/e-table-sorted-variable.h?h=WITH_LIBEFS'>widgets/e-table/e-table-sorted-variable.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.2%;'/><td class='none' style='width: 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/e-table/e-table-sorted.c?h=WITH_LIBEFS'>widgets/e-table/e-table-sorted.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.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/e-table/e-table-sorted.h?h=WITH_LIBEFS'>widgets/e-table/e-table-sorted.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.2%;'/><td class='none' style='width: 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/e-table/e-table-subset-variable.c?h=WITH_LIBEFS'>widgets/e-table/e-table-subset-variable.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: 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/e-table/e-table-subset-variable.h?h=WITH_LIBEFS'>widgets/e-table/e-table-subset-variable.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.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/e-table/e-table-subset.c?h=WITH_LIBEFS'>widgets/e-table/e-table-subset.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: 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/e-table/e-table-subset.h?h=WITH_LIBEFS'>widgets/e-table/e-table-subset.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.2%;'/><td class='none' style='width: 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/e-table/e-table-text-model.c?h=WITH_LIBEFS'>widgets/e-table/e-table-text-model.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: 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/e-table/e-table-text-model.h?h=WITH_LIBEFS'>widgets/e-table/e-table-text-model.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.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/e-table/e-table-tree.h?h=WITH_LIBEFS'>widgets/e-table/e-table-tree.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.1%;'/><td class='none' style='width: 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/e-table/e-table.c?h=WITH_LIBEFS'>widgets/e-table/e-table.c</a></td><td class='right'>858</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/widgets/e-table/e-table.h?h=WITH_LIBEFS'>widgets/e-table/e-table.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.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-table/e-tree-example-1.c?h=WITH_LIBEFS'>widgets/e-table/e-tree-example-1.c</a></td><td class='right'>403</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/widgets/e-table/e-tree-model.c?h=WITH_LIBEFS'>widgets/e-table/e-tree-model.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: 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/widgets/e-table/e-tree-model.h?h=WITH_LIBEFS'>widgets/e-table/e-tree-model.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.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-table/e-tree-simple.c?h=WITH_LIBEFS'>widgets/e-table/e-tree-simple.c</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.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/e-table/e-tree-simple.h?h=WITH_LIBEFS'>widgets/e-table/e-tree-simple.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.2%;'/><td class='none' style='width: 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/e-table/image1.png?h=WITH_LIBEFS'>widgets/e-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/e-table/image2.png?h=WITH_LIBEFS'>widgets/e-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/e-table/image3.png?h=WITH_LIBEFS'>widgets/e-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/e-table/remove-col.xpm?h=WITH_LIBEFS'>widgets/e-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/e-table/sample.table?h=WITH_LIBEFS'>widgets/e-table/sample.table</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.1%;'/><td class='none' style='width: 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/e-table/table-test.c?h=WITH_LIBEFS'>widgets/e-table/table-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.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/e-table/table-test.h?h=WITH_LIBEFS'>widgets/e-table/table-test.h</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/widgets/e-table/test-check.c?h=WITH_LIBEFS'>widgets/e-table/test-check.c</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: 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/e-table/test-cols.c?h=WITH_LIBEFS'>widgets/e-table/test-cols.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: 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/e-table/test-table.c?h=WITH_LIBEFS'>widgets/e-table/test-table.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: 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/e-table/tree-expanded.xpm?h=WITH_LIBEFS'>widgets/e-table/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/widgets/e-table/tree-unexpanded.xpm?h=WITH_LIBEFS'>widgets/e-table/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/widgets/e-text/.cvsignore?h=WITH_LIBEFS'>widgets/e-text/.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/e-text/Makefile.am?h=WITH_LIBEFS'>widgets/e-text/Makefile.am</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.2%;'/><td class='none' style='width: 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/e-text/e-text-event-processor-emacs-like.c?h=WITH_LIBEFS'>widgets/e-text/e-text-event-processor-emacs-like.c</a></td><td class='right'>372</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/e-text/e-text-event-processor-emacs-like.h?h=WITH_LIBEFS'>widgets/e-text/e-text-event-processor-emacs-like.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.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/e-text/e-text-event-processor-types.h?h=WITH_LIBEFS'>widgets/e-text/e-text-event-processor-types.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.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/e-text/e-text-event-processor.c?h=WITH_LIBEFS'>widgets/e-text/e-text-event-processor.c</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.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-text/e-text-event-processor.h?h=WITH_LIBEFS'>widgets/e-text/e-text-event-processor.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.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/e-text/e-text-model.c?h=WITH_LIBEFS'>widgets/e-text/e-text-model.c</a></td><td class='right'>241</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/e-text/e-text-model.h?h=WITH_LIBEFS'>widgets/e-text/e-text-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.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/e-text/e-text-test.c?h=WITH_LIBEFS'>widgets/e-text/e-text-test.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.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/e-text/e-text.c?h=WITH_LIBEFS'>widgets/e-text/e-text.c</a></td><td class='right'>3165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.8%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-text/e-text.h?h=WITH_LIBEFS'>widgets/e-text/e-text.h</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: 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/meeting-time-sel/.cvsignore?h=WITH_LIBEFS'>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/meeting-time-sel/LICENSE?h=WITH_LIBEFS'>widgets/meeting-time-sel/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/meeting-time-sel/Makefile.am?h=WITH_LIBEFS'>widgets/meeting-time-sel/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.2%;'/><td class='none' style='width: 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/e-meeting-time-sel-item.c?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel-item.c</a></td><td class='right'>978</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/widgets/meeting-time-sel/e-meeting-time-sel-item.h?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel-item.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.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/meeting-time-sel/e-meeting-time-sel-list-item.c?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel-list-item.c</a></td><td class='right'>393</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/meeting-time-sel/e-meeting-time-sel-list-item.h?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel-list-item.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.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/meeting-time-sel/e-meeting-time-sel-mail.xpm?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm</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.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/meeting-time-sel/e-meeting-time-sel-no-mail.xpm?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel-no-mail.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.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/meeting-time-sel/e-meeting-time-sel.c?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel.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: 18.4%;'/><td class='none' style='width: 81.6%;'/></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/e-meeting-time-sel.h?h=WITH_LIBEFS'>widgets/meeting-time-sel/e-meeting-time-sel.h</a></td><td class='right'>518</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/widgets/meeting-time-sel/test-meeting-time-sel.c?h=WITH_LIBEFS'>widgets/meeting-time-sel/test-meeting-time-sel.c</a></td><td class='right'>242</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/.cvsignore?h=WITH_LIBEFS'>widgets/misc/.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/misc/ChangeLog?h=WITH_LIBEFS'>widgets/misc/ChangeLog</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.1%;'/><td class='none' style='width: 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/Makefile.am?h=WITH_LIBEFS'>widgets/misc/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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/misc/e-canvas-utils.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.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=WITH_LIBEFS'>widgets/misc/e-canvas-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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/misc/e-canvas.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: 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/widgets/misc/e-canvas.h?h=WITH_LIBEFS'>widgets/misc/e-canvas.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.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-clipped-label.c?h=WITH_LIBEFS'>widgets/misc/e-clipped-label.c</a></td><td class='right'>378</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/misc/e-clipped-label.h?h=WITH_LIBEFS'>widgets/misc/e-clipped-label.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.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-colors.c?h=WITH_LIBEFS'>widgets/misc/e-colors.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.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-colors.h?h=WITH_LIBEFS'>widgets/misc/e-colors.h</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.1%;'/><td class='none' style='width: 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-cursors.c?h=WITH_LIBEFS'>widgets/misc/e-cursors.c</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.2%;'/><td class='none' style='width: 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.h?h=WITH_LIBEFS'>widgets/misc/e-cursors.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.2%;'/><td class='none' style='width: 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-gui-utils.c?h=WITH_LIBEFS'>widgets/misc/e-gui-utils.c</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.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-gui-utils.h?h=WITH_LIBEFS'>widgets/misc/e-gui-utils.h</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.1%;'/><td class='none' style='width: 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-popup-menu.c?h=WITH_LIBEFS'>widgets/misc/e-popup-menu.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.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=WITH_LIBEFS'>widgets/misc/e-popup-menu.h</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.1%;'/><td class='none' style='width: 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-printable.c?h=WITH_LIBEFS'>widgets/misc/e-printable.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: 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/misc/e-printable.h?h=WITH_LIBEFS'>widgets/misc/e-printable.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.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-reflow.c?h=WITH_LIBEFS'>widgets/misc/e-reflow.c</a></td><td class='right'>848</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/widgets/misc/e-reflow.h?h=WITH_LIBEFS'>widgets/misc/e-reflow.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.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-scroll-frame.c?h=WITH_LIBEFS'>widgets/misc/e-scroll-frame.c</a></td><td class='right'>1246</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/widgets/misc/e-scroll-frame.h?h=WITH_LIBEFS'>widgets/misc/e-scroll-frame.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.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-title-bar.c?h=WITH_LIBEFS'>widgets/misc/e-title-bar.c</a></td><td class='right'>271</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-title-bar.h?h=WITH_LIBEFS'>widgets/misc/e-title-bar.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.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/pixmaps/cursor_cross.xpm?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/pixmaps/cursor_hand_closed.xpm?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/pixmaps/cursor_hand_open.xpm?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/pixmaps/cursor_zoom_in.xpm?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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/pixmaps/cursor_zoom_out.xpm?h=WITH_LIBEFS'>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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/misc/test-title-bar.c</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.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/shortcut-bar/.cvsignore?h=WITH_LIBEFS'>widgets/shortcut-bar/.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/shortcut-bar/ChangeLog?h=WITH_LIBEFS'>widgets/shortcut-bar/ChangeLog</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: 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/shortcut-bar/LICENSE?h=WITH_LIBEFS'>widgets/shortcut-bar/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/shortcut-bar/Makefile.am?h=WITH_LIBEFS'>widgets/shortcut-bar/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.2%;'/><td class='none' style='width: 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/shortcut-bar/e-group-bar.c?h=WITH_LIBEFS'>widgets/shortcut-bar/e-group-bar.c</a></td><td class='right'>1545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.7%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/shortcut-bar/e-group-bar.h?h=WITH_LIBEFS'>widgets/shortcut-bar/e-group-bar.h</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: 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/shortcut-bar/e-icon-bar-bg-item.c?h=WITH_LIBEFS'>widgets/shortcut-bar/e-icon-bar-bg-item.c</a></td><td class='right'>365</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/shortcut-bar/e-icon-bar-bg-item.h?h=WITH_LIBEFS'>widgets/shortcut-bar/e-icon-bar-bg-item.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.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/shortcut-bar/e-icon-bar.c?h=WITH_LIBEFS'>widgets/shortcut-bar/e-icon-bar.c</a></td><td class='right'>1599</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/shortcut-bar/e-icon-bar.h?h=WITH_LIBEFS'>widgets/shortcut-bar/e-icon-bar.h</a></td><td class='right'>243</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/shortcut-bar/e-shortcut-bar.c?h=WITH_LIBEFS'>widgets/shortcut-bar/e-shortcut-bar.c</a></td><td class='right'>673</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/widgets/shortcut-bar/e-shortcut-bar.h?h=WITH_LIBEFS'>widgets/shortcut-bar/e-shortcut-bar.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.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/shortcut-bar/e-vscrolled-bar.c?h=WITH_LIBEFS'>widgets/shortcut-bar/e-vscrolled-bar.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: 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/widgets/shortcut-bar/e-vscrolled-bar.h?h=WITH_LIBEFS'>widgets/shortcut-bar/e-vscrolled-bar.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.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/shortcut-bar/test-shortcut-bar.c?h=WITH_LIBEFS'>widgets/shortcut-bar/test-shortcut-bar.c</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: 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/widgets/table/.cvsignore?h=WITH_LIBEFS'>widgets/table/.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.1%;'/><td class='none' style='width: 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/add-col.xpm?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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-up.xpm?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/check-empty.xpm?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/check-filled.xpm?h=WITH_LIBEFS'>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.1%;'/><td class='none' style='width: 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/clip.png?h=WITH_LIBEFS'>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=WITH_LIBEFS'>widgets/table/e-cell-checkbox.c</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/table/e-cell-checkbox.h</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/widgets/table/e-cell-string.c?h=WITH_LIBEFS'>widgets/table/e-cell-string.c</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.1%;'/><td class='none' style='width: 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-text.c?h=WITH_LIBEFS'>widgets/table/e-cell-text.c</a></td><td class='right'>2155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.1%;'/><td class='none' style='width: 87.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-text.h?h=WITH_LIBEFS'>widgets/table/e-cell-text.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.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-toggle.c?h=WITH_LIBEFS'>widgets/table/e-cell-toggle.c</a></td><td class='right'>299</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-cell-toggle.h?h=WITH_LIBEFS'>widgets/table/e-cell-toggle.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.2%;'/><td class='none' style='width: 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-tree.c?h=WITH_LIBEFS'>widgets/table/e-cell-tree.c</a></td><td class='right'>546</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/table/e-cell-tree.h?h=WITH_LIBEFS'>widgets/table/e-cell-tree.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.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-cell.c?h=WITH_LIBEFS'>widgets/table/e-cell.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: 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.h?h=WITH_LIBEFS'>widgets/table/e-cell.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.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-dnd.h?h=WITH_LIBEFS'>widgets/table/e-table-col-dnd.h</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/table/e-table-col.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.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-col.h?h=WITH_LIBEFS'>widgets/table/e-table-col.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.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-column-model.h?h=WITH_LIBEFS'>widgets/table/e-table-column-model.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/widgets/table/e-table-column.c?h=WITH_LIBEFS'>widgets/table/e-table-column.c</a></td><td class='right'>293</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-table-config.c?h=WITH_LIBEFS'>widgets/table/e-table-config.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: 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-config.glade?h=WITH_LIBEFS'>widgets/table/e-table-config.glade</a></td><td class='right'>302</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-table-config.glade.h?h=WITH_LIBEFS'>widgets/table/e-table-config.glade.h</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.1%;'/><td class='none' style='width: 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-config.h?h=WITH_LIBEFS'>widgets/table/e-table-config.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.1%;'/><td class='none' style='width: 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-defines.h?h=WITH_LIBEFS'>widgets/table/e-table-defines.h</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.1%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/table/e-table-example-1.c</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: 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-example-2.c?h=WITH_LIBEFS'>widgets/table/e-table-example-2.c</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: 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-table-field-chooser-dialog.c?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser-dialog.c</a></td><td class='right'>190</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-field-chooser-dialog.h?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser-dialog.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.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-field-chooser-item.c?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser-item.c</a></td><td class='right'>566</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-table-field-chooser-item.h?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser-item.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.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.c?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser.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: 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-field-chooser.glade?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser.glade</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.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-field-chooser.glade.h?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser.glade.h</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.1%;'/><td class='none' style='width: 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-field-chooser.h?h=WITH_LIBEFS'>widgets/table/e-table-field-chooser.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.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-container.c?h=WITH_LIBEFS'>widgets/table/e-table-group-container.c</a></td><td class='right'>1105</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-table-group-container.h?h=WITH_LIBEFS'>widgets/table/e-table-group-container.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.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-group-leaf.c?h=WITH_LIBEFS'>widgets/table/e-table-group-leaf.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: 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/widgets/table/e-table-group-leaf.h?h=WITH_LIBEFS'>widgets/table/e-table-group-leaf.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.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-group.c?h=WITH_LIBEFS'>widgets/table/e-table-group.c</a></td><td class='right'>420</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/widgets/table/e-table-group.glade?h=WITH_LIBEFS'>widgets/table/e-table-group.glade</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: 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-table-group.glade.h?h=WITH_LIBEFS'>widgets/table/e-table-group.glade.h</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.1%;'/><td class='none' style='width: 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-group.h?h=WITH_LIBEFS'>widgets/table/e-table-group.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.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-header-item.c?h=WITH_LIBEFS'>widgets/table/e-table-header-item.c</a></td><td class='right'>1423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 92.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-header-item.h?h=WITH_LIBEFS'>widgets/table/e-table-header-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.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.c?h=WITH_LIBEFS'>widgets/table/e-table-header.c</a></td><td class='right'>663</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/widgets/table/e-table-header.h?h=WITH_LIBEFS'>widgets/table/e-table-header.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.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-item.c?h=WITH_LIBEFS'>widgets/table/e-table-item.c</a></td><td class='right'>2027</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.4%;'/><td class='none' style='width: 88.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-item.h?h=WITH_LIBEFS'>widgets/table/e-table-item.h</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.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-model.c?h=WITH_LIBEFS'>widgets/table/e-table-model.c</a></td><td class='right'>281</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-model.h?h=WITH_LIBEFS'>widgets/table/e-table-model.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.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-simple.c?h=WITH_LIBEFS'>widgets/table/e-table-simple.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: 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-simple.h?h=WITH_LIBEFS'>widgets/table/e-table-simple.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.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=WITH_LIBEFS'>widgets/table/e-table-size-test.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: 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-sort-info.c?h=WITH_LIBEFS'>widgets/table/e-table-sort-info.c</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: 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-sort-info.h?h=WITH_LIBEFS'>widgets/table/e-table-sort-info.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.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=WITH_LIBEFS'>widgets/table/e-table-sorted-variable.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: 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/table/e-table-sorted-variable.h?h=WITH_LIBEFS'>widgets/table/e-table-sorted-variable.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/table/e-table-sorted.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.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.h?h=WITH_LIBEFS'>widgets/table/e-table-sorted.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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>widgets/table/e-table-subset-variable.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: 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-variable.h?h=WITH_LIBEFS'>widgets/table/e-table-subset-variable.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.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-subset.c?h=WITH_LIBEFS'>widgets/table/e-table-subset.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: 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-subset.h?h=WITH_LIBEFS'>widgets/table/e-table-subset.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.2%;'/><td class='none' style='width: 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-text-model.c?h=WITH_LIBEFS'>widgets/table/e-table-text-model.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: 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-table-text-model.h?h=WITH_LIBEFS'>widgets/table/e-table-text-model.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.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-tree.h?h=WITH_LIBEFS'>widgets/table/e-table-tree.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.1%;'/><td class='none' style='width: 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.c?h=WITH_LIBEFS'>widgets/table/e-table.c</a></td><td class='right'>858</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/widgets/table/e-table.h?h=WITH_LIBEFS'>widgets/table/e-table.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.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-example-1.c?h=WITH_LIBEFS'>widgets/table/e-tree-example-1.c</a></td><td class='right'>403</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/widgets/table/e-tree-model.c?h=WITH_LIBEFS'>widgets/table/e-tree-model.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: 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/widgets/table/e-tree-model.h?h=WITH_LIBEFS'>widgets/table/e-tree-model.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.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-simple.c?h=WITH_LIBEFS'>widgets/table/e-tree-simple.c</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.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=WITH_LIBEFS'>widgets/table/e-tree-simple.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.2%;'/><td class='none' style='width: 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/image1.png?h=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>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=WITH_LIBEFS'>widgets/table/sample.table</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.1%;'/><td class='none' style='width: 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.c?h=WITH_LIBEFS'>widgets/table/table-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.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/table-test.h?h=WITH_LIBEFS'>widgets/table/table-test.h</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/widgets/table/test-check.c?h=WITH_LIBEFS'>widgets/table/test-check.c</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: 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/test-cols.c?h=WITH_LIBEFS'>widgets/table/test-cols.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: 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/test-table.c?h=WITH_LIBEFS'>widgets/table/test-table.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: 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/table/tree-expanded.xpm?h=WITH_LIBEFS'>widgets/table/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/widgets/table/tree-unexpanded.xpm?h=WITH_LIBEFS'>widgets/table/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/widgets/text/.cvsignore?h=WITH_LIBEFS'>widgets/text/.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/text/e-table-text-model.c?h=WITH_LIBEFS'>widgets/text/e-table-text-model.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: 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/text/e-table-text-model.h?h=WITH_LIBEFS'>widgets/text/e-table-text-model.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.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-event-processor-emacs-like.c?h=WITH_LIBEFS'>widgets/text/e-text-event-processor-emacs-like.c</a></td><td class='right'>372</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/text/e-text-event-processor-emacs-like.h?h=WITH_LIBEFS'>widgets/text/e-text-event-processor-emacs-like.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.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-event-processor-types.h?h=WITH_LIBEFS'>widgets/text/e-text-event-processor-types.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.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-event-processor.c?h=WITH_LIBEFS'>widgets/text/e-text-event-processor.c</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.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-text-event-processor.h?h=WITH_LIBEFS'>widgets/text/e-text-event-processor.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.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-model.c?h=WITH_LIBEFS'>widgets/text/e-text-model.c</a></td><td class='right'>241</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/text/e-text-model.h?h=WITH_LIBEFS'>widgets/text/e-text-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.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-test.c?h=WITH_LIBEFS'>widgets/text/e-text-test.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.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/text/e-text.c?h=WITH_LIBEFS'>widgets/text/e-text.c</a></td><td class='right'>3165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.8%;'/><td class='none' style='width: 82.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.h?h=WITH_LIBEFS'>widgets/text/e-text.h</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: 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/wombat/.cvsignore?h=WITH_LIBEFS'>wombat/.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.1%;'/><td class='none' style='width: 99.9%;'/></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=WITH_LIBEFS'>wombat/ChangeLog</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.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/GNOME_Evolution_Wombat.oaf.in?h=WITH_LIBEFS'>wombat/GNOME_Evolution_Wombat.oaf.in</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.2%;'/><td class='none' style='width: 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_Wombat.oafinfo?h=WITH_LIBEFS'>wombat/GNOME_Evolution_Wombat.oafinfo</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.2%;'/><td class='none' style='width: 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=WITH_LIBEFS'>wombat/Makefile.am</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.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/wombat/wombat.c?h=WITH_LIBEFS'>wombat/wombat.c</a></td><td class='right'>285</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/wombat/wombat.gnorba?h=WITH_LIBEFS'>wombat/wombat.gnorba</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.1%;'/><td class='none' style='width: 99.9%;'/></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=WITH_LIBEFS'>wombat/wombat.idl</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.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat.oafinfo?h=WITH_LIBEFS'>wombat/wombat.oafinfo</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.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1458 files changed, 0 insertions, 394977 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 00c805b196..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +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='head'>diff --git a/AUTHORS b/AUTHORS<br/>deleted file mode 100644<br/>index 7bb4918333..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/AUTHORS?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>AUTHORS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-Evolution was written by:</div><div class='del'>-</div><div class='del'>-Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>-	Main author of Camel</div><div class='del'>-</div><div class='del'>-Chris Lahey (clahey@helixcode.com)</div><div class='del'>-	Mini-card display widget</div><div class='del'>-	Contact manager user interface</div><div class='del'>-</div><div class='del'>-Damon Chaplin &lt;damon@helixcode.com&gt;</div><div class='del'>-	Meeting time selector widget</div><div class='del'>-	Shortcut Bar widget</div><div class='del'>-</div><div class='del'>-Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>-	Evolution Shell</div><div class='del'>-	Message composer</div><div class='del'>-</div><div class='del'>-Federico Mena &lt;federico@helixcode.com&gt;</div><div class='del'>-	Gnome Calendar views, and engine</div><div class='del'>-	Gnome Calendar server</div><div class='del'>-</div><div class='del'>-Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>-	Gnome Calendar engine</div><div class='del'>-	Base64 encoding in Camel</div><div class='del'>-	Evolution Shell</div><div class='del'>-	ETable widget</div><div class='del'>-	Toolbar</div><div class='del'>-</div><div class='del'>-Nat Friedman &lt;nat@helixcode.com&gt;</div><div class='del'>-	EBook and Personal Address Book server.</div><div class='del'>-</div><div class='del'>-Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-	Unicode and RFC2047 support for Camel.</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/ChangeLog b/ChangeLog<br/>deleted file mode 100644<br/>index 9acc5a1a66..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/ChangeLog?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4883 +0,0 @@</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 7a42d1eee8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/MAINTAINERS?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>MAINTAINERS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-Email: miguel@kernel.org</div><div class='head'>diff --git a/Makefile.am b/Makefile.am<br/>deleted file mode 100644<br/>index d3b340e965..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +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'>-	README			\</div><div class='del'>-	HACKING			\</div><div class='del'>-	MAINTAINERS		\</div><div class='del'>-	NEWS			\</div><div class='del'>-	evolution.spec.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'>-	widgets			\</div><div class='del'>-	shell			\</div><div class='del'>-	libibex			\</div><div class='del'>-	camel			\</div><div class='del'>-	filter			\</div><div class='del'>-	composer		\</div><div class='del'>-	mail			\</div><div class='del'>-	libical			\</div><div class='del'>-	libversit		\</div><div class='del'>-	addressbook		\</div><div class='del'>-	calendar		\</div><div class='del'>-	wombat			\</div><div class='del'>-	art			\</div><div class='del'>-	default_user		\</div><div class='del'>-	tools			\</div><div class='del'>-	po			\</div><div class='del'>-	doc</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'>-applicationdir = $(datadir)/gnome/apps/Applications</div><div class='del'>-application_DATA = evolution.desktop</div><div class='del'>-</div><div class='del'>-dist-hook: evolution.spec</div><div class='del'>-	cp evolution.spec $(distdir)</div><div class='head'>diff --git a/NEWS b/NEWS<br/>deleted file mode 100644<br/>index 5b9f6e1c60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/NEWS?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>NEWS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-01/Jun/1999</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-New development document from Giao Nguyen :</div><div class='del'>-TITLE: An in-depth look at the virtual folder mechanism</div><div class='del'>-(see devel-docs/query)</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/README b/README<br/>deleted file mode 100644<br/>index c8570e61f1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/README?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-Evolution is the integrated mail, calendar and address book</div><div class='del'>-distributed suite from Helix Code, Inc.</div><div class='del'>-</div><div class='del'>-See http://www.helixcode.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 interested in hacking on Evolution, you should subscribe to</div><div class='del'>-the Evolution mailing list. Send mail to</div><div class='del'>-"evolution-request@helixcode.com" with the word "subscribe" in the</div><div class='del'>-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 is a mailing list archive available at</div><div class='del'>-http://lists.helixcode.com/archives/public/evolution/</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'>-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, but may make it harder to uninstall 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" and "autogen"</div><div class='del'>-when building the other packages you need. Eg:</div><div class='del'>-</div><div class='del'>-	./configure --prefix=/usr --sysconfdir=/etc</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-If you do not do this, you will need to set the GNOME_PATH environment</div><div class='del'>-variable (and ACLOCAL_FLAGS as well if building from CVS) to include</div><div class='del'>-the prefix you install into. Eg:</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.</div><div class='del'>-</div><div class='del'>-If you install Evolution into a different prefix from OAF, you will</div><div class='del'>-also need to set OAF_INFO_PATH to include the directory where the</div><div class='del'>-oafinfo files are installed (${prefix}/share/oaf). (OAF will</div><div class='del'>-eventually obey the GNOME_PATH variable, but it does not do so</div><div class='del'>-currently.) Eg:</div><div class='del'>-</div><div class='del'>-	export OAF_INFO_PATH=/usr/local/share/oaf</div><div class='del'>-</div><div class='del'>-If you are already running an oafd, you will need to kill it after</div><div class='del'>-setting that variable so it gets restarted later with that in its</div><div class='del'>-environment.</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'>-All of these libraries are available in GNOME CVS, under the given</div><div class='del'>-names. Most (but not all) of them are also available as tarballs on</div><div class='del'>-ftp.gnome.org. The (*)ed packages are available in Helix GNOME.</div><div class='del'>-(http://www.helixcode.com/desktop/)</div><div class='del'>-</div><div class='del'>- - gnome-xml - currently, only 1.8.7 works. Earlier versions have a</div><div class='del'>-   bug in code that Evolution needs, and the 2.0 branch is not source</div><div class='del'>-   or binary compatible. If you get this from GNOME CVS, use the tag</div><div class='del'>-   "LIB_XML_1_X". (*)</div><div class='del'>-</div><div class='del'>- - gnome-print (whatever version is currently needed by gtkhtml) (*)</div><div class='del'>-</div><div class='del'>- - gdk-pixbuf - 0.7.0 or later (*)</div><div class='del'>-</div><div class='del'>- - ORBit - 0.5.1 (*) or later from the orbit-stable-0-5 branch in CVS.</div><div class='del'>-   (i.e. do 'cvs co -r orbit-stable-0-5 ORBit')</div><div class='del'>-</div><div class='del'>- - oaf - 0.3 or later. Note that if you build the current CVS version</div><div class='del'>-   of OAF rather than the 0.3 release, you will need a newer version</div><div class='del'>-   of ORBit than 0.5.1 (see above).</div><div class='del'>-</div><div class='del'>- - bonobo - Evolution always tracks the latest CVS versions of bonobo.</div><div class='del'>-   Released versions will virtually always be too old (although as of</div><div class='del'>-   June 2, bonobo 0.15 is recent enough).</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'>- - gnome-vfs (released versions are OK currently, but CVS versions are</div><div class='del'>-   better.)</div><div class='del'>-</div><div class='del'>- - libunicode - 0.4 or later, available from</div><div class='del'>-   http://www.pango.org/download.shtml</div><div class='del'>-</div><div class='del'>- - gconf - from CVS (there are currently no released versions)</div><div class='del'>-</div><div class='del'>- - gtkhtml - from CVS</div><div class='del'>-</div><div class='del'>- - libglade (*)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-At some point in the future, Evolution will have Pilot sync support,</div><div class='del'>-which will depend on the following libraries. (At the moment, it will</div><div class='del'>-check to see whether or not you have them, but it will not actually do</div><div class='del'>-anything with them.)</div><div class='del'>-</div><div class='del'>- - pilot-link (*)</div><div class='del'>-</div><div class='del'>- - gnome-pilot (*)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The layout of the source tree is:</div><div class='del'>-</div><div class='del'>-addressbook:	the Address Book UI</div><div class='del'>-art:		graphics used by evolution</div><div class='del'>-calendar:	the Calendar UI</div><div class='del'>-camel:		libcamel, a messaging library used by the mailer.</div><div class='del'>-		Camel is inspired by Sun's JavaMail</div><div class='del'>-		(http://java.sun.com/products/javamail/) and the</div><div class='del'>-		IMAPv4 spec (RFC 2060).</div><div class='del'>-composer:	the message composer UI</div><div class='del'>-data:		the .desktop file for Evolution</div><div class='del'>-default_user:	initial Evolution config files for new users</div><div class='del'>-devel-docs:	entirely inadequate documentation</div><div class='del'>-doc:		more adequate documentation</div><div class='del'>-e-util:		utility code used by various parts of Evolution</div><div class='del'>-filter:		libfilter, a mail filtering library</div><div class='del'>-libibex:	an indexing library used by the mailer</div><div class='del'>-libical:	a library for the iCalendar format (RFC 2445-2446)</div><div class='del'>-libversit:	a library for the vCard (RFC 2425-2426) and vCalendar</div><div class='del'>-		(http://www.imc.org/pdi/vcal-10.txt) formats</div><div class='del'>-mail:		the mail display UI</div><div class='del'>-shell:		the Evolution shell (the main program that launches</div><div class='del'>-		the other components)</div><div class='del'>-tests:		some test programs</div><div class='del'>-tools:		utilities, notably "killev", a script to kill of all</div><div class='del'>-		of the Evolution components</div><div class='del'>-widgets:	widgets used by Evolution, including the shortcut bar,</div><div class='del'>-		ETable, and EText</div><div class='del'>-wombat:		Has source code that will load in the addressbook</div><div class='del'>-		and calendar backend, and will form the server</div><div class='del'>-		process we'll be using</div><div class='head'>diff --git a/acconfig.h b/acconfig.h<br/>deleted file mode 100644<br/>index fe6c5e8e49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/acconfig.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>acconfig.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +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 HAVE_BONOBO</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 USING_OAF</div><div class='del'>-#undef HAVE_KRB4</div><div class='del'>-#undef HAVE_KRB5</div><div class='del'>-</div><div class='del'>-/* Define this if you want to build against the development gtk */</div><div class='del'>-#undef HAVE_DEVGTK</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 18000af5aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ChangeLog?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1194 +0,0 @@</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/Makefile.am b/addressbook/Makefile.am<br/>deleted file mode 100644<br/>index 4ff2b4a114..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-SUBDIRS =	\</div><div class='del'>-	ename backend contact-editor printing gui</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 c0341fbdce..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +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='head'>diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am<br/>deleted file mode 100644<br/>index c0ab395564..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +0,0 @@</div><div class='del'>-noinst_PROGRAMS = test-card test-client test-client-list load-pine-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'>-</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) $(srcdir)/../idl/addressbook.idl $(idl_flags)</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \</div><div class='del'>-	-DG_LOG_DOMAIN=\"EBook\"			\</div><div class='del'>-	-I$(top_srcdir) 				\</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'>-        $(BONOBO_GNOME_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-card-cursor.c					\</div><div class='del'>-	e-card-iterator.c				\</div><div class='del'>-	e-card-list-iterator.c				\</div><div class='del'>-	e-card-list.c					\</div><div class='del'>-	e-card-simple.c					\</div><div class='del'>-	e-card.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-card-cursor.h					\</div><div class='del'>-	e-card-iterator.h				\</div><div class='del'>-	e-card-list-iterator.h				\</div><div class='del'>-	e-card-list.h					\</div><div class='del'>-	e-card-pairs.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'>-</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'>-	$(BONOBO_GNOME_LIBS)				\</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)/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'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/addressbook/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la		\</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'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/addressbook/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la		\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</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'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/addressbook/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la		\</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='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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 5efdaa37df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-listener.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,587 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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 (Evolution_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_Evolution_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   idle_id;</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;response_queue != NULL) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (listener),</div><div class='del'>-				 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) {</div><div class='del'>-		listener-&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'>-e_book_listener_queue_response (EBookListener         *listener,</div><div class='del'>-				EBookListenerResponse *response)</div><div class='del'>-{</div><div class='del'>-	listener-&gt;priv-&gt;response_queue =</div><div class='del'>-		g_list_append (listener-&gt;priv-&gt;response_queue,</div><div class='del'>-			       response);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;idle_id == 0) {</div><div class='del'>-		listener-&gt;priv-&gt;idle_id = g_idle_add (</div><div class='del'>-			(GSourceFunc) e_book_listener_check_queue, 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_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'>-	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'>-				     Evolution_Book  book)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</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'>-	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'>-	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_cursor_response (EBookListener        *listener,</div><div class='del'>-					   EBookStatus           status,</div><div class='del'>-					   Evolution_CardCursor  cursor)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</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'>-					 Evolution_BookView    book_view)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</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_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'>-	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'>-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,</div><div class='del'>-				       const Evolution_BookListener_CallStatus  status,</div><div class='del'>-				       const Evolution_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 Evolution_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 Evolution_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_cursor (PortableServer_Servant servant,</div><div class='del'>-				      const Evolution_BookListener_CallStatus status,</div><div class='del'>-				      const Evolution_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'>-	Evolution_CardCursor  cursor_copy;</div><div class='del'>-</div><div class='del'>-	cursor_copy = CORBA_Object_duplicate (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 Evolution_BookListener_CallStatus status,</div><div class='del'>-				    const Evolution_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'>-	Evolution_BookView    book_view_copy;</div><div class='del'>-</div><div class='del'>-	book_view_copy = CORBA_Object_duplicate (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_open_book (PortableServer_Servant servant,</div><div class='del'>-				     const Evolution_BookListener_CallStatus status,</div><div class='del'>-				     const Evolution_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'>-	Evolution_Book  book_copy;</div><div class='del'>-</div><div class='del'>-	book_copy = CORBA_Object_duplicate (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_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'>-/**</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 Evolution_BookListener_CallStatus status)</div><div class='del'>-{</div><div class='del'>-	switch (status) {</div><div class='del'>-	case Evolution_BookListener_Success:</div><div class='del'>-		return E_BOOK_STATUS_SUCCESS;</div><div class='del'>-	case Evolution_BookListener_RepositoryOffline:</div><div class='del'>-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;</div><div class='del'>-	case Evolution_BookListener_PermissionDenied:</div><div class='del'>-		return E_BOOK_STATUS_PERMISSION_DENIED;</div><div class='del'>-	case Evolution_BookListener_CardNotFound:</div><div class='del'>-		return E_BOOK_STATUS_CARD_NOT_FOUND;</div><div class='del'>-	case Evolution_BookListener_ProtocolNotSupported:</div><div class='del'>-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;</div><div class='del'>-	case Evolution_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_Evolution_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_Evolution_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_Evolution_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'>-		gtk_object_unref (GTK_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'>-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'>-	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'>-		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'>-			CORBA_Object_release (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'>-			CORBA_Object_release (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'>-			CORBA_Object_release (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'>-	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_Evolution_BookListener__epv *</div><div class='del'>-e_book_listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_BookListener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_BookListener__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;report_open_book_progress = impl_BookListener_report_open_book_progress;</div><div class='del'>-	epv-&gt;respond_open_book         = impl_BookListener_respond_open_book;</div><div class='del'>-</div><div class='del'>-	epv-&gt;respond_create_card       = impl_BookListener_respond_create_card;</div><div class='del'>-	epv-&gt;respond_remove_card       = impl_BookListener_respond_remove_card;</div><div class='del'>-	epv-&gt;respond_modify_card       = impl_BookListener_respond_modify_card;</div><div class='del'>-</div><div class='del'>-	epv-&gt;respond_get_cursor        = impl_BookListener_respond_get_cursor;</div><div class='del'>-	epv-&gt;respond_get_view          = impl_BookListener_respond_get_view;</div><div class='del'>-</div><div class='del'>-	epv-&gt;report_connection_status  = impl_BookListener_report_connection_status;</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.Evolution_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 eb0432e360..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-listener.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-listener.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'>- * 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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-</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'>-	GetCursorResponse,</div><div class='del'>-	GetBookViewResponse,</div><div class='del'>-</div><div class='del'>-	/* Async events */</div><div class='del'>-	LinkStatusEvent,</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'>-	Evolution_Book          book;</div><div class='del'>-</div><div class='del'>-	/* For GetCursorResponse */</div><div class='del'>-	Evolution_CardCursor    cursor;</div><div class='del'>-</div><div class='del'>-	/* For GetBookViewReponse */</div><div class='del'>-	Evolution_BookView      book_view;</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 Card[Added|Removed|Modified]Event */</div><div class='del'>-	char                   *id;</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'>-</div><div class='del'>-POA_Evolution_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 a3e8bbc032..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-types.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-types.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'>- * 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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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_PROTOCOL_NOT_SUPPORTED,</div><div class='del'>-	E_BOOK_STATUS_OTHER_ERROR</div><div class='del'>-} EBookStatus;</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-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c<br/>deleted file mode 100644<br/>index 71f942798a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view-listener.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-view-listener.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'>-/*</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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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_Evolution_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   idle_id;</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;response_queue != NULL) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (listener),</div><div class='del'>-				 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) {</div><div class='del'>-		listener-&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'>-e_book_view_listener_queue_response (EBookViewListener         *listener,</div><div class='del'>-				     EBookViewListenerResponse *response)</div><div class='del'>-{</div><div class='del'>-	listener-&gt;priv-&gt;response_queue =</div><div class='del'>-		g_list_append (listener-&gt;priv-&gt;response_queue,</div><div class='del'>-			       response);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;idle_id == 0) {</div><div class='del'>-		listener-&gt;priv-&gt;idle_id = g_idle_add (</div><div class='del'>-			(GSourceFunc) e_book_view_listener_check_queue, 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'>-	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'>-</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'>-	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'>-</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 Evolution_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'>-	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'>-	</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'>-static void</div><div class='del'>-impl_BookViewListener_signal_card_added (PortableServer_Servant servant,</div><div class='del'>-					 const Evolution_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_signal_card_removed (PortableServer_Servant servant,</div><div class='del'>-					   const Evolution_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_signal_card_changed (PortableServer_Servant servant,</div><div class='del'>-					   const Evolution_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_signal_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'>-/**</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_Evolution_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_Evolution_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_Evolution_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'>-		gtk_object_unref (GTK_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;idle_id        = 0;</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'>-	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'>-		if (resp-&gt;id)</div><div class='del'>-			g_free(resp-&gt;id);</div><div class='del'>-		if (resp-&gt;cards) {</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'>-		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'>-	</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_Evolution_BookViewListener__epv *</div><div class='del'>-e_book_view_listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_BookViewListener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_BookViewListener__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;signal_card_changed       = impl_BookViewListener_signal_card_changed;</div><div class='del'>-	epv-&gt;signal_card_removed       = impl_BookViewListener_signal_card_removed;</div><div class='del'>-	epv-&gt;signal_card_added         = impl_BookViewListener_signal_card_added;</div><div class='del'>-	epv-&gt;signal_sequence_complete  = impl_BookViewListener_signal_sequence_complete;</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.Evolution_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 65e5f8eb5b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view-listener.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-view-listener.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'>- * 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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-} 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'>-} 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'>-</div><div class='del'>-POA_Evolution_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 f00a2efb08..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-view.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'>-/*</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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Helix Code, 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'>-</div><div class='del'>-GtkObjectClass *e_book_view_parent_class;</div><div class='del'>-</div><div class='del'>-struct _EBookViewPrivate {</div><div class='del'>-	Evolution_BookView     corba_book_view;</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'>-	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'>-e_book_view_do_added_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_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'>-	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'>-</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'>-	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'>-	}</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, Evolution_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 = CORBA_Object_duplicate(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'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Evolution_BookView_ref(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 ("e_book_view_construct: Exception reffing corba_book_view.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-	        CORBA_Object_release (book_view-&gt;priv-&gt;corba_book_view, &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_view_construct: Exception releasing corba_book_view.\n");</div><div class='del'>-		}</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'>-</div><div class='del'>-	bonobo_object_ref(BONOBO_OBJECT(book_view-&gt;priv-&gt;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'>-	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 (Evolution_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'>-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;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;corba_book_view) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		Evolution_BookView_unref(book_view-&gt;priv-&gt;corba_book_view, &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("EBookView: Exception while unreffing BookView\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'>-		CORBA_Object_release (book_view-&gt;priv-&gt;corba_book_view, &amp;ev);</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'>-		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'>-	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'>-	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 b8edc68018..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book-view.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'>- * The Evolution addressbook client object.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Helix Code, 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 _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'>-};</div><div class='del'>-</div><div class='del'>-/* Creating a new addressbook. */</div><div class='del'>-EBookView         *e_book_view_new                    (Evolution_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'>-void               e_book_view_get_book_view_listener (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 ce1c663073..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1010 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Helix Code, 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-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'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#define CARDSERVER_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#define CARDSERVER_GOAD_ID "evolution:addressbook-server"</div><div class='del'>-#endif</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'>-	Evolution_BookFactory  book_factory;</div><div class='del'>-	EBookListener	      *listener;</div><div class='del'>-</div><div class='del'>-	Evolution_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'>-</div><div class='del'>-enum {</div><div class='del'>-	OPEN_PROGRESS,</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'>-	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'>-static void</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;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'>-	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'>-</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 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'>-	g_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'>-	g_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 (op-&gt;cb)</div><div class='del'>-		((EBookCursorCallback) op-&gt;cb) (book, resp-&gt;status, cursor, op-&gt;closure);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Release the remote Evolution_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_Unknown_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 unref'ing "</div><div class='del'>-			   "remote Evolution_CardCursor interface!\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 (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 Evolution_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'>-	</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'>-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 (op-&gt;cb)</div><div class='del'>-		((EBookBookViewCallback) op-&gt;cb) (book, resp-&gt;status, book_view, op-&gt;closure);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Release the remote Evolution_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_Unknown_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 unref'ing "</div><div class='del'>-			   "remote Evolution_BookView interface!\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 (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 Evolution_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'>-	bonobo_object_unref(BONOBO_OBJECT(op-&gt;listener));</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'>-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'>-	g_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'>-</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'>-		e_book_do_response_generic (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 OpenBookResponse:</div><div class='del'>-		e_book_do_response_open (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'>-	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'>-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'>-	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 (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'>-	/*</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'>-	/*</div><div class='del'>-	 * Load the addressbook into the PAS.</div><div class='del'>-	 */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	Evolution_BookFactory_open_book (</div><div class='del'>-		book-&gt;priv-&gt;book_factory, 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'>-		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'>-	book-&gt;priv-&gt;load_state = URILoading;</div><div class='del'>-</div><div class='del'>-	e_book_queue_op (book, open_response, closure, NULL);</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 == URINotLoaded) {</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 Evolution_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_Unknown_unref  (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_unload_uri: Exception unref'ing "</div><div class='del'>-			   "remote Evolution_Book interface!\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 (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_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'>-	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'>-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'>-	/*</div><div class='del'>-	 * Connect to the Personal Addressbook Server.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-	book-&gt;priv-&gt;book_factory = (Evolution_BookFactory)</div><div class='del'>-		oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);</div><div class='del'>-#else</div><div class='del'>-	book-&gt;priv-&gt;book_factory = (Evolution_BookFactory)</div><div class='del'>-		goad_server_activate_with_id (NULL, CARDSERVER_GOAD_ID, 0, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;book_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!\n");</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'>- * 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'>-/* 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'>-ECard *</div><div class='del'>-e_book_get_card (EBook       *book,</div><div class='del'>-		 const char  *id)</div><div class='del'>-{</div><div class='del'>-	char  *vcard;</div><div class='del'>-	ECard *card;</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_card: No URI loaded!\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vcard = e_book_get_vcard (book, id);</div><div class='del'>-</div><div class='del'>-	if (vcard == NULL) {</div><div class='del'>-		g_warning ("e_book_get_card: Got bogus VCard from PAS!\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = e_card_new (vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	</div><div class='del'>-	e_card_set_id(card, id);</div><div class='del'>-</div><div class='del'>-	return card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_get_vcard:</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_book_get_vcard (EBook       *book,</div><div class='del'>-		  const char  *id)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-	char              *retval;</div><div class='del'>-	char              *vcard;</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_vcard: 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'>-	vcard = Evolution_Book_get_vcard (book-&gt;priv-&gt;corba_book,</div><div class='del'>-					  (Evolution_CardId) id,</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_get_vcard: Exception getting VCard 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 (vcard == NULL || strlen (vcard) == 0) {</div><div class='del'>-		g_warning ("e_book_get_vcard: Got NULL VCard from PAS!\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = g_strdup (vcard);</div><div class='del'>-	CORBA_free (vcard);</div><div class='del'>-</div><div class='del'>-	return retval;</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'>-	Evolution_Book_remove_card (</div><div class='del'>-		book-&gt;priv-&gt;corba_book, (const Evolution_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'>-		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'>-	e_book_queue_op (book, cb, closure, NULL);</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 (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'>-	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'>-	Evolution_Book_create_card (</div><div class='del'>-		book-&gt;priv-&gt;corba_book, (const Evolution_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'>-		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'>-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);</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 (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'>-	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'>-	Evolution_Book_modify_card (</div><div class='del'>-		book-&gt;priv-&gt;corba_book, (const Evolution_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'>-		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'>-	e_book_queue_op (book, cb, closure, 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_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'>-	Evolution_Book_check_connection (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'>-gboolean 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'>-  </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'>-	Evolution_Book_get_cursor (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'>-		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'>-	e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean e_book_get_book_view       (EBook                 *book,</div><div class='del'>-				     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'>-  </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_get_book_view: 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'>-	Evolution_Book_get_book_view (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'>-		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'>-	e_book_queue_op (book, cb, closure, 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_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 = Evolution_Book_get_name (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'>-}</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'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URINotLoaded)</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'>-	CORBA_Object_release (book-&gt;priv-&gt;book_factory, &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'>-	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'>-	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 a57c7263b3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-book.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'>-/*</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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Helix Code, 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'>-};</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 (*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'>-</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'>-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'>-/* Fetching cards. */</div><div class='del'>-ECard    *e_book_get_card           (EBook         *book,</div><div class='del'>-				     const char    *id);</div><div class='del'>-char     *e_book_get_vcard          (EBook         *book,</div><div class='del'>-				     const char    *id);</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'>-</div><div class='del'>-gboolean 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'>-gboolean e_book_get_book_view       (EBook                 *book,</div><div class='del'>-				     char                  *query,</div><div class='del'>-				     EBookBookViewCallback  cb,</div><div class='del'>-				     gpointer               closure);</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-cursor.c b/addressbook/backend/ebook/e-card-cursor.c<br/>deleted file mode 100644<br/>index 1618a6ddee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-cursor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.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/gtk.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'>-	Evolution_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'>-	Evolution_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 = Evolution_CardCursor_get_length(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 = Evolution_CardCursor_get_nth(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 #Evolution_CardCursor</div><div class='del'>- *</div><div class='del'>- * Wraps an #Evolution_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'>-			 Evolution_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'>-	Evolution_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 #Evolution_CardCursor to be wrapped</div><div class='del'>- *</div><div class='del'>- * Creates a new #ECardCursor, which wraps an #Evolution_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 (Evolution_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 b318e646c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-cursor.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.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       (Evolution_CardCursor  corba_cursor);</div><div class='del'>-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,</div><div class='del'>-				      Evolution_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-iterator.c b/addressbook/backend/ebook/e-card-iterator.c<br/>deleted file mode 100644<br/>index b5a023b5c1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-iterator.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-iterator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,169 +0,0 @@</div><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 Helix Code, 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;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-card-iterator.h"</div><div class='del'>-</div><div class='del'>-#define ECI_CLASS(object) (E_CARD_ITERATOR_CLASS(GTK_OBJECT((object))-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void e_card_iterator_init (ECardIterator *card);</div><div class='del'>-static void e_card_iterator_class_init (ECardIteratorClass *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_card_iterator_signals [LAST_SIGNAL] = { 0, };</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_iterator_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ECardIterator 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;ECardIterator class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_card_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'>-			"ECardIterator",</div><div class='del'>-			sizeof (ECardIterator),</div><div class='del'>-			sizeof (ECardIteratorClass),</div><div class='del'>-			(GtkClassInitFunc) e_card_iterator_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_card_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_card_iterator_class_init (ECardIteratorClass *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_card_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 (ECardIteratorClass, 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_card_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;next       = NULL;</div><div class='del'>-	klass-&gt;prev       = NULL;</div><div class='del'>-	klass-&gt;delete     = 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_card_iterator_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_card_iterator_init (ECardIterator *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_card_iterator_get      (ECardIterator *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_card_iterator_reset    (ECardIterator *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'>-gboolean</div><div class='del'>-e_card_iterator_next     (ECardIterator *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_card_iterator_prev     (ECardIterator *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_card_iterator_delete   (ECardIterator *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</div><div class='del'>-e_card_iterator_set      (ECardIterator *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_card_iterator_is_valid (ECardIterator *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_card_iterator_invalidate (ECardIterator *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_CARD_ITERATOR (iterator));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (iterator),</div><div class='del'>-			 e_card_iterator_signals [INVALIDATE]);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-iterator.h b/addressbook/backend/ebook/e-card-iterator.h<br/>deleted file mode 100644<br/>index 9d657e03ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-iterator.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-iterator.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:</div><div class='del'>- *   Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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_ITERATOR_H__</div><div class='del'>-#define __E_CARD_ITERATOR_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'>-</div><div class='del'>-#define E_TYPE_CARD_ITERATOR            (e_card_iterator_get_type ())</div><div class='del'>-#define E_CARD_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_ITERATOR, ECardIterator))</div><div class='del'>-#define E_CARD_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_ITERATOR, ECardIteratorClass))</div><div class='del'>-#define E_IS_CARD_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_ITERATOR))</div><div class='del'>-#define E_IS_CARD_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_ITERATOR))</div><div class='del'>-</div><div class='del'>-typedef struct _ECardIterator ECardIterator;</div><div class='del'>-typedef struct _ECardIteratorClass ECardIteratorClass;</div><div class='del'>-</div><div class='del'>-struct _ECardIterator {</div><div class='del'>-	GtkObject object;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardIteratorClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Signals */</div><div class='del'>-	void         (*invalidate) (ECardIterator *iterator);</div><div class='del'>-	</div><div class='del'>-	/* Virtual functions */</div><div class='del'>-	const void * (*get)        (ECardIterator *iterator);</div><div class='del'>-	void         (*reset)      (ECardIterator *iterator);</div><div class='del'>-	gboolean     (*next)       (ECardIterator *iterator);</div><div class='del'>-	gboolean     (*prev)       (ECardIterator *iterator);</div><div class='del'>-	void         (*delete)     (ECardIterator *iterator);</div><div class='del'>-	void         (*set)        (ECardIterator *iterator,</div><div class='del'>-				    const void    *object);</div><div class='del'>-	gboolean     (*is_valid)   (ECardIterator *iterator);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const void    *e_card_iterator_get        (ECardIterator *iterator);</div><div class='del'>-void           e_card_iterator_reset      (ECardIterator *iterator);</div><div class='del'>-gboolean       e_card_iterator_next       (ECardIterator *iterator);</div><div class='del'>-gboolean       e_card_iterator_prev       (ECardIterator *iterator);</div><div class='del'>-void           e_card_iterator_delete     (ECardIterator *iterator);</div><div class='del'>-void           e_card_iterator_set        (ECardIterator *iterator, </div><div class='del'>-				           const void    *object);</div><div class='del'>-gboolean       e_card_iterator_is_valid   (ECardIterator *iterator);</div><div class='del'>-</div><div class='del'>-void           e_card_iterator_invalidate (ECardIterator *iterator);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType        e_card_iterator_get_type   (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_ITERATOR_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-list-iterator.c b/addressbook/backend/ebook/e-card-list-iterator.c<br/>deleted file mode 100644<br/>index d23060fda2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-list-iterator.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-list-iterator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,199 +0,0 @@</div><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 Helix Code, 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;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-card-list-iterator.h"</div><div class='del'>-#include "e-card-list.h"</div><div class='del'>-</div><div class='del'>-static void e_card_list_iterator_init (ECardListIterator *card);</div><div class='del'>-static void e_card_list_iterator_class_init (ECardListIteratorClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_card_list_iterator_invalidate (ECardIterator *iterator);</div><div class='del'>-static gboolean e_card_list_iterator_is_valid (ECardIterator *iterator);</div><div class='del'>-static void e_card_list_iterator_set      (ECardIterator *iterator,</div><div class='del'>-					   const void    *object);</div><div class='del'>-static void e_card_list_iterator_delete   (ECardIterator *iterator);</div><div class='del'>-static gboolean e_card_list_iterator_prev     (ECardIterator *iterator);</div><div class='del'>-static gboolean e_card_list_iterator_next     (ECardIterator *iterator);</div><div class='del'>-static void e_card_list_iterator_reset    (ECardIterator *iterator);</div><div class='del'>-static const void *e_card_list_iterator_get      (ECardIterator *iterator);</div><div class='del'>-static void e_card_list_iterator_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (e_card_iterator_get_type ())</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-#define PARENT_CLASS (E_CARD_LIST_ITERATOR_CLASS(parent_class))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_list_iterator_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ECardListIterator 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;ECardListIterator class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_card_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'>-			"ECardListIterator",</div><div class='del'>-			sizeof (ECardListIterator),</div><div class='del'>-			sizeof (ECardListIteratorClass),</div><div class='del'>-			(GtkClassInitFunc) e_card_list_iterator_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_card_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_card_list_iterator_class_init (ECardListIteratorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ECardIteratorClass *iterator_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	iterator_class = E_CARD_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_card_list_iterator_destroy;</div><div class='del'>-</div><div class='del'>-	iterator_class-&gt;invalidate = e_card_list_iterator_invalidate;</div><div class='del'>-	iterator_class-&gt;get        = e_card_list_iterator_get;</div><div class='del'>-	iterator_class-&gt;reset      = e_card_list_iterator_reset;</div><div class='del'>-	iterator_class-&gt;next       = e_card_list_iterator_next;</div><div class='del'>-	iterator_class-&gt;prev       = e_card_list_iterator_prev;</div><div class='del'>-	iterator_class-&gt;delete     = e_card_list_iterator_delete;</div><div class='del'>-	iterator_class-&gt;set        = e_card_list_iterator_set;</div><div class='del'>-	iterator_class-&gt;is_valid   = e_card_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_card_list_iterator_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_card_list_iterator_init (ECardListIterator *card)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardIterator *</div><div class='del'>-e_card_list_iterator_new (ECardList *list)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = gtk_type_new(e_card_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_CARD_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_card_list_iterator_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_LIST_ITERATOR(object);</div><div class='del'>-	e_card_list_remove_iterator(iterator-&gt;list, E_CARD_ITERATOR(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator-&gt;list));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const void *</div><div class='del'>-e_card_list_iterator_get      (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_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_card_list_iterator_reset    (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_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 gboolean</div><div class='del'>-e_card_list_iterator_next     (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_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'>-	return (iterator-&gt;iterator != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_card_list_iterator_prev     (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_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'>-	return (iterator-&gt;iterator != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_list_iterator_delete   (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		GList *temp = iterator-&gt;iterator-&gt;next;</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'>-		iterator-&gt;list-&gt;list = g_list_remove_link(iterator-&gt;list-&gt;list, iterator-&gt;iterator);</div><div class='del'>-		iterator-&gt;iterator = temp;</div><div class='del'>-		e_card_list_invalidate_iterators(iterator-&gt;list, E_CARD_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_card_list_iterator_set      (ECardIterator *_iterator,</div><div class='del'>-			       const void    *object)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_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_card_list_iterator_is_valid (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_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_card_list_iterator_invalidate (ECardIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	ECardListIterator *iterator = E_CARD_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-list-iterator.h b/addressbook/backend/ebook/e-card-list-iterator.h<br/>deleted file mode 100644<br/>index 38a7d77f21..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-list-iterator.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-list-iterator.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'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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_LIST_ITERATOR_H__</div><div class='del'>-#define __E_CARD_LIST_ITERATOR_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;ebook/e-card-iterator.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_CARD_LIST_ITERATOR            (e_card_list_iterator_get_type ())</div><div class='del'>-#define E_CARD_LIST_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST_ITERATOR, ECardListIterator))</div><div class='del'>-#define E_CARD_LIST_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_LIST_ITERATOR, ECardListIteratorClass))</div><div class='del'>-#define E_IS_CARD_LIST_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_LIST_ITERATOR))</div><div class='del'>-#define E_IS_CARD_LIST_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_LIST_ITERATOR))</div><div class='del'>-</div><div class='del'>-typedef struct _ECardListIterator ECardListIterator;</div><div class='del'>-typedef struct _ECardListIteratorClass ECardListIteratorClass;</div><div class='del'>-</div><div class='del'>-struct _ECardListIterator {</div><div class='del'>-	ECardIterator      parent;</div><div class='del'>-</div><div class='del'>-	ECardList         *list;</div><div class='del'>-	GList             *iterator;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardListIteratorClass {</div><div class='del'>-	ECardIteratorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ECardIterator *e_card_list_iterator_new (ECardList *list);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType        e_card_list_iterator_get_type   (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_LIST_ITERATOR_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-list.c b/addressbook/backend/ebook/e-card-list.c<br/>deleted file mode 100644<br/>index e912de7b6e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-list.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-list.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'>- * Authors: </div><div class='del'>- *   Christopher James Lahey &lt;clahey@umich.edu&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-card-list.h"</div><div class='del'>-#include "e-card-list-iterator.h"</div><div class='del'>-</div><div class='del'>-#define ECL_CLASS(object) (E_CARD_LIST_CLASS(GTK_OBJECT((object))-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void e_card_list_init (ECardList *card);</div><div class='del'>-static void e_card_list_class_init (ECardListClass *klass);</div><div class='del'>-static void e_card_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_card_list_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ECardList 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;ECardList class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_card_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'>-			"ECardList",</div><div class='del'>-			sizeof (ECardList),</div><div class='del'>-			sizeof (ECardListClass),</div><div class='del'>-			(GtkClassInitFunc) e_card_list_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_card_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_card_list_class_init (ECardListClass *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_card_list_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_list_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_card_list_init (ECardList *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'>-ECardList *</div><div class='del'>-e_card_list_new          (ECardListCopyFunc copy, ECardListFreeFunc free, void *closure)</div><div class='del'>-{</div><div class='del'>-	ECardList *list = gtk_type_new(e_card_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'>-ECardIterator *</div><div class='del'>-e_card_list_get_iterator (ECardList *list)</div><div class='del'>-{</div><div class='del'>-	ECardIterator *iterator = e_card_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_card_list_length (ECardList *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_card_list_append       (ECardList *list, const void *data)</div><div class='del'>-{</div><div class='del'>-	e_card_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_card_list_invalidate_iterators (ECardList *list, ECardIterator *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_card_iterator_invalidate(E_CARD_ITERATOR(iterators-&gt;data));</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_card_list_remove_iterator (ECardList *list, ECardIterator *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_card_list_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardList *list = E_CARD_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='head'>diff --git a/addressbook/backend/ebook/e-card-list.h b/addressbook/backend/ebook/e-card-list.h<br/>deleted file mode 100644<br/>index af791a81a0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-list.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-list.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'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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_LIST_H__</div><div class='del'>-#define __E_CARD_LIST_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-iterator.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_CARD_LIST            (e_card_list_get_type ())</div><div class='del'>-#define E_CARD_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST, ECardList))</div><div class='del'>-#define E_CARD_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_LIST, ECardListClass))</div><div class='del'>-#define E_IS_CARD_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_LIST))</div><div class='del'>-#define E_IS_CARD_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_LIST))</div><div class='del'>-</div><div class='del'>-typedef void *(*ECardListCopyFunc) (const void *data, void *closure);</div><div class='del'>-typedef void (*ECardListFreeFunc) (void *data, void *closure);</div><div class='del'>-</div><div class='del'>-typedef struct _ECardList ECardList;</div><div class='del'>-typedef struct _ECardListClass ECardListClass;</div><div class='del'>-</div><div class='del'>-struct _ECardList {</div><div class='del'>-	GtkObject          object;</div><div class='del'>-	GList             *list;</div><div class='del'>-	GList             *iterators;</div><div class='del'>-	ECardListCopyFunc  copy;</div><div class='del'>-	ECardListFreeFunc  free;</div><div class='del'>-	void              *closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardListClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ECardList     *e_card_list_new                  (ECardListCopyFunc  copy, </div><div class='del'>-						 ECardListFreeFunc  free,</div><div class='del'>-						 void              *closure);</div><div class='del'>-ECardIterator *e_card_list_get_iterator         (ECardList         *list);</div><div class='del'>-void           e_card_list_append               (ECardList         *list,</div><div class='del'>-						 const void        *data);</div><div class='del'>-int            e_card_list_length               (ECardList         *list);</div><div class='del'>-</div><div class='del'>-/* For iterators to call. */</div><div class='del'>-void           e_card_list_invalidate_iterators (ECardList         *list, </div><div class='del'>-						 ECardIterator     *skip);</div><div class='del'>-void           e_card_list_remove_iterator      (ECardList         *list,</div><div class='del'>-						 ECardIterator     *iterator);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType        e_card_list_get_type             (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_LIST_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 0f379d3477..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-pairs.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 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., 675 Mass Ave, Cambridge, MA 02139, 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 8d2a0f44b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-simple.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-simple.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1185 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *   Arturo Espinosa (arturo@nuclecu.unam.mx)</div><div class='del'>- *   Nat Friedman    (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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/gtk.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'>-#if 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_FBURL,</div><div class='del'>-	ARG_NOTE,</div><div class='del'>-	ARG_ID</div><div class='del'>-#endif</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'>-};</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'>-static ECardSimpleFieldData field_data[] =</div><div class='del'>-{</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",     "File As",       "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",   "Name",          "Name",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "",            "Email",         "Email",    E_CARD_SIMPLE_EMAIL_ID_EMAIL,   	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "",            "Primary",       "Prim",     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "",            "Business",      "Bus",      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "",            "Home",          "Home",     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",         "Organization",  "Org",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "",            "Business",      "Bus",      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "",            "Home",          "Home",     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "",            "Mobile",        "Mobile",   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "",            "Car",           "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",  "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",      "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 2",    "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 2",        "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",          "ISDN",     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "",            "Other",         "Other",    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "",            "Pager",         "Pager",    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "",            "Other",         "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",       "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",       "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",         "Web Site",      "Url",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",    "Department",    "Dep",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",      "Office",        "Off",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",       "Title",         "Title",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",        "Profession",    "Prof",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",     "Manager",       "Man",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",   "Assistant",     "Ass",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",    "Nickname",      "Nick",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",      "Spouse",        "Spouse",   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",        "Note",          "Note",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",       "Free-busy URL", "FBUrl",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary", "Anniversary",   "Anniv",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",  "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'>-};</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'>-	0xFF, /* 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'>-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */</div><div class='del'>-	E_CARD_PHONE_CAR | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */</div><div class='del'>-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */</div><div class='del'>-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */</div><div class='del'>-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* 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_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */</div><div class='del'>-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */</div><div class='del'>-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */</div><div class='del'>-	E_CARD_PHONE_PAGER | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */</div><div class='del'>-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */</div><div class='del'>-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */</div><div class='del'>-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */</div><div class='del'>-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */</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_TTYTTD,	   */</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_TTYTTD,	   */</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 *e_card_simple_duplicate(ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	char *vcard = e_card_simple_get_vcard(simple);</div><div class='del'>-	ECard *card = e_card_new(vcard);</div><div class='del'>-	ECardSimple *new_simple = e_card_simple_new(card);</div><div class='del'>-	g_free (vcard);</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'>-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'>-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'>-#if 0</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::file_as",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::full_name",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  </div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::name",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::address",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::address_label",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::phone",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::email",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::birth_date",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::url",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  </div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::org",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::org_unit",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::office",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::title",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  </div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::role",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::manager",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::assistant",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::nickname",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::spouse",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::anniversary",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::fburl",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::note",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::id",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ID);</div><div class='del'>-#endif</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'>-		g_free(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'>-		g_free(simple-&gt;address[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'>-#if 0</div><div class='del'>-	case ARG_FILE_AS:</div><div class='del'>-		if (simple-&gt;file_as)</div><div class='del'>-			g_free(simple-&gt;file_as);</div><div class='del'>-		simple-&gt;file_as = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FULL_NAME:</div><div class='del'>-		if ( simple-&gt;fname )</div><div class='del'>-			g_free(simple-&gt;fname);</div><div class='del'>-		simple-&gt;fname = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		if ( simple-&gt;name )</div><div class='del'>-			e_card_simple_name_free(simple-&gt;name);</div><div class='del'>-		simple-&gt;name = GTK_VALUE_POINTER(*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BIRTH_DATE:</div><div class='del'>-		if ( simple-&gt;bday )</div><div class='del'>-			g_free(simple-&gt;bday);</div><div class='del'>-		simple-&gt;bday = GTK_VALUE_POINTER(*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_URL:</div><div class='del'>-		if ( simple-&gt;url )</div><div class='del'>-			g_free(simple-&gt;url);</div><div class='del'>-		simple-&gt;url = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG:</div><div class='del'>-		if (simple-&gt;org)</div><div class='del'>-			g_free(simple-&gt;org);</div><div class='del'>-		simple-&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'>-		if (simple-&gt;org_unit)</div><div class='del'>-			g_free(simple-&gt;org_unit);</div><div class='del'>-		simple-&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'>-		if (simple-&gt;office)</div><div class='del'>-			g_free(simple-&gt;office);</div><div class='del'>-		simple-&gt;office = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TITLE:</div><div class='del'>-		if ( simple-&gt;title )</div><div class='del'>-			g_free(simple-&gt;title);</div><div class='del'>-		simple-&gt;title = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ROLE:</div><div class='del'>-		if (simple-&gt;role)</div><div class='del'>-			g_free(simple-&gt;role);</div><div class='del'>-		simple-&gt;role = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MANAGER:</div><div class='del'>-		if (simple-&gt;manager)</div><div class='del'>-			g_free(simple-&gt;manager);</div><div class='del'>-		simple-&gt;manager = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ASSISTANT:</div><div class='del'>-		if (simple-&gt;assistant)</div><div class='del'>-			g_free(simple-&gt;assistant);</div><div class='del'>-		simple-&gt;assistant = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NICKNAME:</div><div class='del'>-		if (simple-&gt;nickname)</div><div class='del'>-			g_free(simple-&gt;nickname);</div><div class='del'>-		simple-&gt;nickname = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SPOUSE:</div><div class='del'>-		if (simple-&gt;spouse)</div><div class='del'>-			g_free(simple-&gt;spouse);</div><div class='del'>-		simple-&gt;spouse = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ANNIVERSARY:</div><div class='del'>-		if ( simple-&gt;anniversary )</div><div class='del'>-			g_free(simple-&gt;anniversary);</div><div class='del'>-		simple-&gt;anniversary = GTK_VALUE_POINTER(*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FBURL:</div><div class='del'>-		if (simple-&gt;fburl)</div><div class='del'>-			g_free(simple-&gt;fburl);</div><div class='del'>-		simple-&gt;fburl = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NOTE:</div><div class='del'>-		if (simple-&gt;note)</div><div class='del'>-			g_free (simple-&gt;note);</div><div class='del'>-		simple-&gt;note = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ID:</div><div class='del'>-		if (simple-&gt;id)</div><div class='del'>-			g_free(simple-&gt;id);</div><div class='del'>-		simple-&gt;id = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-#endif</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'>-		if (simple-&gt;card)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(simple-&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'>-#if 0</div><div class='del'>-	case ARG_FILE_AS:</div><div class='del'>-		GTK_VALUE_STRING (*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FULL_NAME:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = simple-&gt;fname;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = simple-&gt;name;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		if (!simple-&gt;address)</div><div class='del'>-			simple-&gt;address = e_card_simple_list_new((ECardSimpleListCopyFunc) e_card_simple_delivery_address_copy, </div><div class='del'>-							(ECardSimpleListFreeFunc) e_card_simple_delivery_address_free,</div><div class='del'>-							NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(simple-&gt;address);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ADDRESS_LABEL:</div><div class='del'>-		if (!simple-&gt;address_label)</div><div class='del'>-			simple-&gt;address_label = e_card_simple_list_new((ECardSimpleListCopyFunc) e_card_simple_address_label_copy, </div><div class='del'>-							      (ECardSimpleListFreeFunc) e_card_simple_address_label_free,</div><div class='del'>-							      NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(simple-&gt;address_label);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_PHONE:</div><div class='del'>-		if (!simple-&gt;phone)</div><div class='del'>-			simple-&gt;phone = e_card_simple_list_new((ECardSimpleListCopyFunc) e_card_simple_phone_copy, </div><div class='del'>-						      (ECardSimpleListFreeFunc) e_card_simple_phone_free,</div><div class='del'>-						      NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(simple-&gt;phone);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EMAIL:</div><div class='del'>-		if (!simple-&gt;email)</div><div class='del'>-			simple-&gt;email = e_card_simple_list_new((ECardSimpleListCopyFunc) g_strdup, </div><div class='del'>-						      (ECardSimpleListFreeFunc) g_free,</div><div class='del'>-						      NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(simple-&gt;email);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BIRTH_DATE:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = simple-&gt;bday;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_URL:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;url;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;org;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG_UNIT:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;org_unit;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_OFFICE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;office;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TITLE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;title;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ROLE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;role;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MANAGER:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;manager;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ASSISTANT:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;assistant;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NICKNAME:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;nickname;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SPOUSE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;spouse;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ANNIVERSARY:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = simple-&gt;anniversary;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FBURL:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;fburl;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NOTE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;note;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ID:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = simple-&gt;id;</div><div class='del'>-		break;</div><div class='del'>-#endif</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'>-</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'>-		ECardList *address_list;</div><div class='del'>-		ECardList *phone_list;</div><div class='del'>-		ECardList *email_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'>-		int i;</div><div class='del'>-</div><div class='del'>-		ECardIterator *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'>-			       "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_free(simple-&gt;phone[i]);</div><div class='del'>-			simple-&gt;phone[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_card_list_get_iterator(phone_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			phone = e_card_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 &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_copy(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_card_list_get_iterator(email_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			email = e_card_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_free(simple-&gt;address[i]);</div><div class='del'>-			simple-&gt;address[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_card_list_get_iterator(address_list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			address = e_card_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_copy(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'>-}</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) {</div><div class='del'>-		ECardList *address_list;</div><div class='del'>-		ECardList *phone_list;</div><div class='del'>-		ECardList *email_list;</div><div class='del'>-		const ECardPhone *phone;</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-		const char *email;</div><div class='del'>-		int i;</div><div class='del'>-		int iterator_next = 1;</div><div class='del'>-</div><div class='del'>-		ECardIterator *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'>-			       "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_card_list_get_iterator(phone_list); e_card_iterator_is_valid(iterator); iterator_next ? e_card_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			phone = e_card_iterator_get(iterator);</div><div class='del'>-			iterator_next = 1;</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_card_iterator_set(iterator, simple-&gt;phone[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_card_iterator_delete(iterator);</div><div class='del'>-							iterator_next = 0;</div><div class='del'>-						}</div><div class='del'>-						e_card_phone_free(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_card_list_append(phone_list, simple-&gt;phone[i]);</div><div class='del'>-				e_card_phone_free(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_card_list_get_iterator(email_list); e_card_iterator_is_valid(iterator); iterator_next ? e_card_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			email = e_card_iterator_get(iterator);</div><div class='del'>-			iterator_next = 1;</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_card_iterator_set(iterator, simple-&gt;email[i]);</div><div class='del'>-					} else {</div><div class='del'>-						e_card_iterator_delete(iterator);</div><div class='del'>-						iterator_next = 0;</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_card_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_card_list_get_iterator(address_list); e_card_iterator_is_valid(iterator); iterator_next ? e_card_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			address = e_card_iterator_get(iterator);</div><div class='del'>-			iterator_next = 1;</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 = 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_card_iterator_set(iterator, simple-&gt;address[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_card_iterator_delete(iterator);</div><div class='del'>-							iterator_next = 0;</div><div class='del'>-						}</div><div class='del'>-						e_card_address_label_free(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 = addr_correspondences[i];</div><div class='del'>-				e_card_list_append(address_list, simple-&gt;address[i]);</div><div class='del'>-				e_card_address_label_free(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'>-		fill_in_info(simple);</div><div class='del'>-	}</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'>-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'>-	if (simple-&gt;phone[id])</div><div class='del'>-		e_card_phone_free(simple-&gt;phone[id]);</div><div class='del'>-	simple-&gt;phone[id] = e_card_phone_copy(phone);</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'>-	if (simple-&gt;email[id])</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'>-}</div><div class='del'>-</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'>-{</div><div class='del'>-	if (simple-&gt;address[id])</div><div class='del'>-		e_card_address_label_free(simple-&gt;address[id]);</div><div class='del'>-	simple-&gt;address[id] = e_card_address_label_copy(address);</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'>-	switch(type) {</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</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'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:</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'>-		return NULL; /* FIXME!!!! */</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'>-	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 *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);</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 (!full_name)</div><div class='del'>-		full_name = g_strdup("");</div><div class='del'>-	if (!company)</div><div class='del'>-		company = g_strdup("");</div><div class='del'>-	if (filestring) {</div><div class='del'>-</div><div class='del'>-		name = e_card_name_from_string(full_name);</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(full_name);</div><div class='del'>-	g_free(company);</div><div class='del'>-	if (name)</div><div class='del'>-		e_card_name_free(name);</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 *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);</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 (!full_name)</div><div class='del'>-			full_name = g_strdup("");</div><div class='del'>-		if (!company)</div><div class='del'>-			company = g_strdup("");</div><div class='del'>-		name = e_card_name_from_string(full_name);</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(full_name);</div><div class='del'>-		g_free(company);</div><div class='del'>-		e_card_name_free(name);</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'>-	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 = (char *) 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'>-			address-&gt;data = NULL;</div><div class='del'>-			e_card_address_label_free(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 = (char *) 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'>-			phone-&gt;number = NULL;</div><div class='del'>-			e_card_phone_free(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'>-		}</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'>-	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'>-}</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 field_data[field].name;</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 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'>-		ECardList *list;</div><div class='del'>-		ECardIterator *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_card_list_get_iterator(list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_card_iterator_get(iterator);</div><div class='del'>-			if (callback)</div><div class='del'>-				(*callback) (arbitrary, closure);</div><div class='del'>-		}</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'>-		ECardList *list;</div><div class='del'>-		ECardIterator *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_card_list_get_iterator(list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_card_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'>-	}</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'>-		ECardList *list;</div><div class='del'>-		ECardIterator *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_card_list_get_iterator(list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_card_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_card_iterator_set(iterator, new_arb);</div><div class='del'>-				e_card_arbitrary_free(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_card_list_append(list, new_arb);</div><div class='del'>-		e_card_arbitrary_free(new_arb);</div><div class='del'>-	}</div><div class='del'>-}</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 72351c571a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-simple.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-simple.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,197 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *   Arturo Espinosa</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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;addressbook/backend/ebook/e-card-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_TTYTTD,</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'>-};</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_BUSINESS,</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_PAGER,</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_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_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'>-};</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'>-	       </div><div class='del'>-ECardSimple    	     *e_card_simple_new               (ECard *card);</div><div class='del'>-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'>-	       	     				      </div><div class='del'>-ECardSimple    	     *e_card_simple_duplicate         (ECardSimple *simple);</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'>-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'>-	       					       </div><div class='del'>-ECardSimpleType	      e_card_simple_type              (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'>-</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'>-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'>-</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'>-						      </div><div class='del'>-void                  e_card_simple_sync_card         (ECardSimple *simple);</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='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 57aed690aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-types.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card-types.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'>- * Authors:</div><div class='del'>- *   Arturo Espinosa</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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'>-	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'>-} ECardPhoneFlags;</div><div class='del'>-</div><div class='del'>-typedef struct {</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_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'>-} ECardAddressFlags;</div><div class='del'>-</div><div class='del'>-typedef struct {</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'>-	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'>-	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 b07723073f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3248 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libversit/vcc.h&gt;</div><div class='del'>-#include "e-card.h"</div><div class='del'>-#include "e-card-pairs.h"</div><div class='del'>-#include "e-name-western.h"</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</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_ARBITRARY "X-EVOLUTION-ARBITRARY"</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_FBURL,</div><div class='del'>-	ARG_NOTE,</div><div class='del'>-	ARG_CATEGORIES,</div><div class='del'>-	ARG_CATEGORY_LIST,</div><div class='del'>-	ARG_ARBITRARY,</div><div class='del'>-	ARG_ID</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static VObject *card_convert_to_vobject (ECard *crd);</div><div class='del'>-#endif</div><div class='del'>-static void parse(ECard *card, VObject *vobj);</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 **string);</div><div class='del'>-</div><div class='del'>-char *e_v_object_get_child_value(VObject *vobj, char *name);</div><div class='del'>-static ECardDate e_card_date_from_string (char *str);</div><div class='del'>-</div><div class='del'>-static void parse_bday(ECard *card, VObject *object);</div><div class='del'>-static void parse_full_name(ECard *card, VObject *object);</div><div class='del'>-static void parse_file_as(ECard *card, VObject *object);</div><div class='del'>-static void parse_name(ECard *card, VObject *object);</div><div class='del'>-static void parse_email(ECard *card, VObject *object);</div><div class='del'>-static void parse_phone(ECard *card, VObject *object);</div><div class='del'>-static void parse_address(ECard *card, VObject *object);</div><div class='del'>-static void parse_address_label(ECard *card, VObject *object);</div><div class='del'>-static void parse_url(ECard *card, VObject *object);</div><div class='del'>-static void parse_org(ECard *card, VObject *object);</div><div class='del'>-static void parse_office(ECard *card, VObject *object);</div><div class='del'>-static void parse_title(ECard *card, VObject *object);</div><div class='del'>-static void parse_role(ECard *card, VObject *object);</div><div class='del'>-static void parse_manager(ECard *card, VObject *object);</div><div class='del'>-static void parse_assistant(ECard *card, VObject *object);</div><div class='del'>-static void parse_nickname(ECard *card, VObject *object);</div><div class='del'>-static void parse_spouse(ECard *card, VObject *object);</div><div class='del'>-static void parse_anniversary(ECard *card, VObject *object);</div><div class='del'>-static void parse_mailer(ECard *card, VObject *object);</div><div class='del'>-static void parse_fburl(ECard *card, VObject *object);</div><div class='del'>-static void parse_note(ECard *card, VObject *object);</div><div class='del'>-static void parse_categories(ECard *card, VObject *object);</div><div class='del'>-static void parse_arbitrary(ECard *card, VObject *object);</div><div class='del'>-static void parse_id(ECard *card, VObject *object);</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);</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'>-	{ "FBURL",                   parse_fburl },</div><div class='del'>-	{ VCNoteProp,                parse_note },</div><div class='del'>-	{ "CATEGORIES",              parse_categories },</div><div class='del'>-	{ XEV_ARBITRARY,             parse_arbitrary },</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'>-/**</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'>-	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);</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'>-	return card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *e_card_duplicate(ECard *card)</div><div class='del'>-{</div><div class='del'>-	char *vcard = e_card_get_vcard(card);</div><div class='del'>-	ECard *new_card = e_card_new(vcard);</div><div class='del'>-	g_free (vcard);</div><div class='del'>-	return new_card;</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'>-char *</div><div class='del'>-e_card_get_id (ECard *card)</div><div class='del'>-{</div><div class='del'>-	return 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'>-	if ( card-&gt;id )</div><div class='del'>-		g_free(card-&gt;id);</div><div class='del'>-	card-&gt;id = g_strdup(id);</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; /*, *vprop; */</div><div class='del'>-	char *temp, *ret_val;</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'>-		addPropValue(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 )</div><div class='del'>-		addPropValue(vobj, VCFullNameProp, card-&gt;fname);</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'>-		nameprop = addProp(vobj, VCNameProp);</div><div class='del'>-		if ( card-&gt;name-&gt;prefix )</div><div class='del'>-			addPropValue(nameprop, VCNamePrefixesProp, card-&gt;name-&gt;prefix);</div><div class='del'>-		if ( card-&gt;name-&gt;given )</div><div class='del'>-			addPropValue(nameprop, VCGivenNameProp, card-&gt;name-&gt;given);</div><div class='del'>-		if ( card-&gt;name-&gt;additional )</div><div class='del'>-			addPropValue(nameprop, VCAdditionalNamesProp, card-&gt;name-&gt;additional);</div><div class='del'>-		if ( card-&gt;name-&gt;family )</div><div class='del'>-			addPropValue(nameprop, VCFamilyNameProp, card-&gt;name-&gt;family);</div><div class='del'>-		if ( card-&gt;name-&gt;suffix )</div><div class='del'>-			addPropValue(nameprop, VCNameSuffixesProp, card-&gt;name-&gt;suffix);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;address ) {</div><div class='del'>-		ECardIterator *iterator = e_card_list_get_iterator(card-&gt;address);</div><div class='del'>-		for ( ; e_card_iterator_is_valid(iterator) ;e_card_iterator_next(iterator) ) {</div><div class='del'>-			VObject *addressprop;</div><div class='del'>-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_card_iterator_get(iterator);</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'>-				addPropValue(addressprop, VCPostalBoxProp, address-&gt;po);</div><div class='del'>-			if ( address-&gt;ext )</div><div class='del'>-				addPropValue(addressprop, VCExtAddressProp, address-&gt;ext);</div><div class='del'>-			if ( address-&gt;street )</div><div class='del'>-				addPropValue(addressprop, VCStreetAddressProp, address-&gt;street);</div><div class='del'>-			if ( address-&gt;city )</div><div class='del'>-				addPropValue(addressprop, VCCityProp, address-&gt;city);</div><div class='del'>-			if ( address-&gt;region )</div><div class='del'>-				addPropValue(addressprop, VCRegionProp, address-&gt;region);</div><div class='del'>-			if ( address-&gt;code )</div><div class='del'>-				addPropValue(addressprop, VCPostalCodeProp, address-&gt;code);</div><div class='del'>-			if ( address-&gt;country )</div><div class='del'>-				addPropValue(addressprop, VCCountryNameProp, 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'>-</div><div class='del'>-	if ( card-&gt;address_label ) {</div><div class='del'>-		ECardIterator *iterator = e_card_list_get_iterator(card-&gt;address_label);</div><div class='del'>-		for ( ; e_card_iterator_is_valid(iterator) ;e_card_iterator_next(iterator) ) {</div><div class='del'>-			VObject *labelprop;</div><div class='del'>-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_card_iterator_get(iterator);</div><div class='del'>-			if (address_label-&gt;data)</div><div class='del'>-				labelprop = addPropValue(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'>-			addProp(labelprop, VCQuotedPrintableProp);</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'>-		ECardIterator *iterator = e_card_list_get_iterator(card-&gt;phone);</div><div class='del'>-		for ( ; e_card_iterator_is_valid(iterator) ;e_card_iterator_next(iterator) ) {</div><div class='del'>-			VObject *phoneprop;</div><div class='del'>-			ECardPhone *phone = (ECardPhone *) e_card_iterator_get(iterator);</div><div class='del'>-			phoneprop = addPropValue(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'>-		ECardIterator *iterator = e_card_list_get_iterator(card-&gt;email);</div><div class='del'>-		for ( ; e_card_iterator_is_valid(iterator) ;e_card_iterator_next(iterator) ) {</div><div class='del'>-			VObject *emailprop;</div><div class='del'>-			emailprop = addPropValue(vobj, VCEmailAddressProp, (char *) e_card_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'>-		ECardDate date;</div><div class='del'>-		char *value;</div><div class='del'>-		date = *card-&gt;bday;</div><div class='del'>-		date.year = MIN(date.year, 9999);</div><div class='del'>-		date.month = MIN(date.month, 12);</div><div class='del'>-		date.day = MIN(date.day, 31);</div><div class='del'>-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);</div><div class='del'>-		addPropValue(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'>-		addPropValue(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'>-		orgprop = addProp(vobj, VCOrgProp);</div><div class='del'>-		</div><div class='del'>-		if (card-&gt;org)</div><div class='del'>-			addPropValue(orgprop, VCOrgNameProp, card-&gt;org);</div><div class='del'>-		if (card-&gt;org_unit)</div><div class='del'>-			addPropValue(orgprop, VCOrgUnitProp, card-&gt;org_unit);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;office)</div><div class='del'>-		addPropValue(vobj, "X-EVOLUTION-OFFICE", card-&gt;office);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;title)</div><div class='del'>-		addPropValue(vobj, VCTitleProp, card-&gt;title);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;role)</div><div class='del'>-		addPropValue(vobj, VCBusinessRoleProp, card-&gt;role);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;manager)</div><div class='del'>-		addPropValue(vobj, "X-EVOLUTION-MANAGER", card-&gt;manager);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;assistant)</div><div class='del'>-		addPropValue(vobj, "X-EVOLUTION-ASSISTANT", card-&gt;assistant);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;nickname)</div><div class='del'>-		addPropValue(vobj, "NICKNAME", card-&gt;nickname);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;spouse)</div><div class='del'>-		addPropValue(vobj, "X-EVOLUTION-SPOUSE", card-&gt;spouse);</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;anniversary ) {</div><div class='del'>-		ECardDate date;</div><div class='del'>-		char *value;</div><div class='del'>-		date = *card-&gt;anniversary;</div><div class='del'>-		date.year = MIN(date.year, 9999);</div><div class='del'>-		date.month = MIN(date.month, 12);</div><div class='del'>-		date.day = MIN(date.day, 31);</div><div class='del'>-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);</div><div class='del'>-		addPropValue(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'>-		addPropValue(vobj, VCMailerProp, card-&gt;mailer);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;fburl)</div><div class='del'>-		addPropValue(vobj, "FBURL", card-&gt;fburl);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;note)</div><div class='del'>-		addPropValue(vobj, VCNoteProp, card-&gt;note);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;categories) {</div><div class='del'>-		ECardIterator *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_card_list_get_iterator(card-&gt;categories); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			length += strlen(e_card_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_card_iterator_reset(iterator); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			strcpy(stringptr, e_card_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'>-		addPropValue (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;arbitrary) {</div><div class='del'>-		ECardIterator *iterator;</div><div class='del'>-		for (iterator = e_card_list_get_iterator(card-&gt;arbitrary); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_card_iterator_get(iterator);</div><div class='del'>-			VObject *arb_object;</div><div class='del'>-			if (arbitrary-&gt;value) {</div><div class='del'>-				arb_object = addPropValue (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'>-				addPropValue (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'>-	if (card-&gt;id)</div><div class='del'>-		addPropValue (vobj, VCUniqueStringProp, card-&gt;id);</div><div class='del'>-	</div><div class='del'>-#if 0</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;photo.prop.used) {</div><div class='del'>-		vprop = addPropSizedValue (vobj, VCPhotoProp, </div><div class='del'>-					  crd-&gt;photo.data, crd-&gt;photo.size);</div><div class='del'>-		add_PhotoType (vprop, crd-&gt;photo.type);</div><div class='del'>-		add_CardProperty (vprop, &amp;crd-&gt;photo.prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (crd-&gt;xtension.l) {</div><div class='del'>-		GList *node;</div><div class='del'>-		</div><div class='del'>-		for (node = crd-&gt;xtension.l; node; node = node-&gt;next) {</div><div class='del'>-			CardXProperty *xp = (CardXProperty *) node-&gt;data;</div><div class='del'>-			addPropValue (vobj, xp-&gt;name, xp-&gt;data);</div><div class='del'>-			add_CardProperty (vobj, &amp;xp-&gt;prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;timezn.prop.used) {</div><div class='del'>-		char *str;</div><div class='del'>-		</div><div class='del'>-		str = card_timezn_str (crd-&gt;timezn);</div><div class='del'>-		vprop = addPropValue (vobj, VCTimeZoneProp, str);</div><div class='del'>-		free (str);</div><div class='del'>-		add_CardProperty (vprop, &amp;crd-&gt;timezn.prop);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;geopos.prop.used) {</div><div class='del'>-		char *str;</div><div class='del'>-		</div><div class='del'>-		str = card_geopos_str (crd-&gt;geopos);</div><div class='del'>-		vprop = addPropValue (vobj, VCGeoLocationProp, str);</div><div class='del'>-		free (str);</div><div class='del'>-		add_CardProperty (vprop, &amp;crd-&gt;geopos.prop);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;logo.prop.used) {</div><div class='del'>-		vprop = addPropSizedValue (vobj, VCLogoProp, </div><div class='del'>-					  crd-&gt;logo.data, crd-&gt;logo.size);</div><div class='del'>-		add_PhotoType (vprop, crd-&gt;logo.type);</div><div class='del'>-		add_CardProperty (vprop, &amp;crd-&gt;logo.prop);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;agent)</div><div class='del'>-	  addVObjectProp (vobj, card_convert_to_vobject (crd-&gt;agent));</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;sound.prop.used) {</div><div class='del'>-		if (crd-&gt;sound.type != SOUND_PHONETIC)</div><div class='del'>-		  vprop = addPropSizedValue (vobj, VCPronunciationProp,</div><div class='del'>-					    crd-&gt;sound.data, crd-&gt;sound.size);</div><div class='del'>-		else</div><div class='del'>-		  vprop = addPropValue (vobj, VCPronunciationProp, </div><div class='del'>-				       crd-&gt;sound.data);</div><div class='del'>-		</div><div class='del'>-		add_SoundType (vprop, crd-&gt;sound.type);</div><div class='del'>-		add_CardProperty (vprop, &amp;crd-&gt;sound.prop);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;key.prop.used) {</div><div class='del'>-		vprop = addPropValue (vobj, VCPublicKeyProp, crd-&gt;key.data);</div><div class='del'>-		add_KeyType (vprop, crd-&gt;key.type);</div><div class='del'>-		add_CardProperty (vprop, &amp;crd-&gt;key.prop);</div><div class='del'>-	}</div><div class='del'>-#endif</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'>-static void</div><div class='del'>-parse_file_as(ECard *card, VObject *vobj)</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, &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)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;name ) {</div><div class='del'>-		e_card_name_free(card-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	card-&gt;name = g_new(ECardName, 1);</div><div class='del'>-</div><div class='del'>-	card-&gt;name-&gt;family     = e_v_object_get_child_value (vobj, VCFamilyNameProp);</div><div class='del'>-	card-&gt;name-&gt;given      = e_v_object_get_child_value (vobj, VCGivenNameProp);</div><div class='del'>-	card-&gt;name-&gt;additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp);</div><div class='del'>-	card-&gt;name-&gt;prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp);</div><div class='del'>-	card-&gt;name-&gt;suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp);</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)</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, &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)</div><div class='del'>-{</div><div class='del'>-	char *next_email;</div><div class='del'>-	ECardList *list;</div><div class='del'>-</div><div class='del'>-	assign_string(vobj, &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_card_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'>-static void</div><div class='del'>-parse_bday(ECard *card, VObject *vobj)</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)</div><div class='del'>-{</div><div class='del'>-	ECardPhone *next_phone = g_new(ECardPhone, 1);</div><div class='del'>-	ECardList *list;</div><div class='del'>-</div><div class='del'>-	assign_string(vobj, &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_card_list_append(list, next_phone);</div><div class='del'>-	e_card_phone_free (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)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *next_addr = g_new(ECardDeliveryAddress, 1);</div><div class='del'>-	ECardList *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);</div><div class='del'>-	next_addr-&gt;ext     = e_v_object_get_child_value (vobj, VCExtAddressProp);</div><div class='del'>-	next_addr-&gt;street  = e_v_object_get_child_value (vobj, VCStreetAddressProp);</div><div class='del'>-	next_addr-&gt;city    = e_v_object_get_child_value (vobj, VCCityProp);</div><div class='del'>-	next_addr-&gt;region  = e_v_object_get_child_value (vobj, VCRegionProp);</div><div class='del'>-	next_addr-&gt;code    = e_v_object_get_child_value (vobj, VCPostalCodeProp);</div><div class='del'>-	next_addr-&gt;country = e_v_object_get_child_value (vobj, VCCountryNameProp);</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_card_list_append(list, next_addr);</div><div class='del'>-	e_card_delivery_address_free (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)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *next_addr = g_new(ECardAddrLabel, 1);</div><div class='del'>-	ECardList *list;</div><div class='del'>-</div><div class='del'>-	next_addr-&gt;flags   = get_address_flags (vobj);</div><div class='del'>-	assign_string(vobj, &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_card_list_append(list, next_addr);</div><div class='del'>-	e_card_address_label_free (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)</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, &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)</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);</div><div class='del'>-	if (temp) {</div><div class='del'>-		if (card-&gt;org)</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);</div><div class='del'>-	if (temp) {</div><div class='del'>-		if (card-&gt;org_unit)</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'>-</div><div class='del'>-static void</div><div class='del'>-parse_office(ECard *card, VObject *vobj)</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, &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)</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, &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)</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, &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)</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, &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)</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, &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)</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, &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)</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, &amp;(card-&gt;spouse));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_anniversary(ECard *card, VObject *vobj)</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)</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, &amp;(card-&gt;mailer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_fburl(ECard *card, VObject *vobj)</div><div class='del'>-{</div><div class='del'>-	g_free(card-&gt;fburl);</div><div class='del'>-	assign_string(vobj, &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)</div><div class='del'>-{</div><div class='del'>-	g_free(card-&gt;note);</div><div class='del'>-	assign_string(vobj, &amp;(card-&gt;note));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_list_unique(ECard *card, ECardList *list, char *string)</div><div class='del'>-{</div><div class='del'>-	char *temp = e_strdup_strip(string);</div><div class='del'>-	ECardIterator *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_card_list_get_iterator(list); e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-		if (!strcmp(e_card_iterator_get(iterator), temp)) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!e_card_iterator_is_valid(iterator)) {</div><div class='del'>-		e_card_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'>-	ECardList *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'>-static void</div><div class='del'>-parse_categories(ECard *card, VObject *vobj)</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'>-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)</div><div class='del'>-{</div><div class='del'>-	ECardArbitrary *arbitrary = e_card_arbitrary_new();</div><div class='del'>-	VObjectIterator iterator;</div><div class='del'>-	ECardList *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, &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, &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_card_list_append(list, arbitrary);</div><div class='del'>-	e_card_arbitrary_free(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)</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'>-	assign_string(vobj, &amp;(card-&gt;id));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_attribute(ECard *card, VObject *vobj)</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);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse(ECard *card, VObject *vobj)</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));</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;name) {</div><div class='del'>-		if (card-&gt;fname) {</div><div class='del'>-			card-&gt;name = e_card_name_from_string(card-&gt;fname);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;file_as) {</div><div class='del'>-		if (card-&gt;name) {</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'>-		} else</div><div class='del'>-			card-&gt;file_as = g_strdup("");</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::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::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::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'>-</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;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_free (ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	if ( phone ) {</div><div class='del'>-		g_free(phone-&gt;number);</div><div class='del'>-</div><div class='del'>-		g_free(phone);</div><div class='del'>-	}</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 = g_new(ECardPhone, 1);</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;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_free (ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</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'>-</div><div class='del'>-		g_free(addr);</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_copy (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</div><div class='del'>-		ECardDeliveryAddress *addr_copy = g_new(ECardDeliveryAddress, 1);</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'>-char *</div><div class='del'>-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	char *strings[4], **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'>-	if (addr-&gt;ext &amp;&amp; *addr-&gt;ext)</div><div class='del'>-		*(stringptr++) = addr-&gt;ext;</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 (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_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;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_free (ECardAddrLabel *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</div><div class='del'>-		g_free(addr-&gt;data);</div><div class='del'>-</div><div class='del'>-		g_free(addr);</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_copy (const ECardAddrLabel *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</div><div class='del'>-		ECardAddrLabel *addr_copy = g_new(ECardAddrLabel, 1);</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;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_free(ECardName *name)</div><div class='del'>-{</div><div class='del'>-	if (name) {</div><div class='del'>-		if ( name-&gt;prefix )</div><div class='del'>-			g_free(name-&gt;prefix);</div><div class='del'>-		if ( name-&gt;given )</div><div class='del'>-			g_free(name-&gt;given);</div><div class='del'>-		if ( name-&gt;additional )</div><div class='del'>-			g_free(name-&gt;additional);</div><div class='del'>-		if ( name-&gt;family )</div><div class='del'>-			g_free(name-&gt;family);</div><div class='del'>-		if ( name-&gt;suffix )</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'>-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 = g_new(ECardName, 1);</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'>-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'>-	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 = g_new(ECardName, 1);</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;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'>-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 = g_new(ECardArbitrary, 1);</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'>-void</div><div class='del'>-e_card_arbitrary_free(ECardArbitrary *arbitrary)</div><div class='del'>-{</div><div class='del'>-	if (arbitrary) {</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'>-	}</div><div class='del'>-	g_free(arbitrary);</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'>-	g_free(card-&gt;file_as);</div><div class='del'>-	g_free(card-&gt;fname);</div><div class='del'>-	if ( card-&gt;name )</div><div class='del'>-		e_card_name_free(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;fburl);</div><div class='del'>-	g_free(card-&gt;note);</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'>-		break;</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'>-		break;</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		if ( card-&gt;name )</div><div class='del'>-			e_card_name_free(card-&gt;name);</div><div class='del'>-		card-&gt;name = GTK_VALUE_POINTER(*arg);</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_CARD_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'>-		card-&gt;bday = GTK_VALUE_POINTER(*arg);</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'>-		card-&gt;anniversary = GTK_VALUE_POINTER(*arg);</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_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_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_CARD_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'>-		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_card_list_new((ECardListCopyFunc) e_card_delivery_address_copy, </div><div class='del'>-							(ECardListFreeFunc) e_card_delivery_address_free,</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_card_list_new((ECardListCopyFunc) e_card_address_label_copy, </div><div class='del'>-							      (ECardListFreeFunc) e_card_address_label_free,</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_card_list_new((ECardListCopyFunc) e_card_phone_copy, </div><div class='del'>-						      (ECardListFreeFunc) e_card_phone_free,</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_card_list_new((ECardListCopyFunc) g_strdup, </div><div class='del'>-						      (ECardListFreeFunc) 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'>-			ECardIterator *iterator;</div><div class='del'>-			if (!card-&gt;categories)</div><div class='del'>-				card-&gt;categories = e_card_list_new((ECardListCopyFunc) g_strdup, </div><div class='del'>-								   (ECardListFreeFunc) g_free,</div><div class='del'>-								   NULL);</div><div class='del'>-			length = e_card_list_length(card-&gt;categories);</div><div class='del'>-			strs = g_new(char *, length + 1);</div><div class='del'>-			for (iterator = e_card_list_get_iterator(card-&gt;categories), i = 0; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator), i++) {</div><div class='del'>-				strs[i] = (char *)e_card_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_card_list_new((ECardListCopyFunc) g_strdup, </div><div class='del'>-							   (ECardListFreeFunc) 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_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_ARBITRARY:</div><div class='del'>-		if (!card-&gt;arbitrary)</div><div class='del'>-			card-&gt;arbitrary = e_card_list_new((ECardListCopyFunc) e_card_arbitrary_copy,</div><div class='del'>-							  (ECardListFreeFunc) e_card_arbitrary_free,</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'>-	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;fburl = NULL;</div><div class='del'>-	card-&gt;note = NULL;</div><div class='del'>-	card-&gt;categories = NULL;</div><div class='del'>-	card-&gt;arbitrary = NULL;</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-	c = g_new0 (ECard, 1);</div><div class='del'>-	</div><div class='del'>-	c-&gt;fname      = </div><div class='del'>-	c-&gt;mailer     = </div><div class='del'>-	c-&gt;role       = </div><div class='del'>-	c-&gt;comment    = </div><div class='del'>-	c-&gt;categories = </div><div class='del'>-	c-&gt;uid        = e_card_prop_str_empty ();</div><div class='del'>-	</div><div class='del'>-	c-&gt;photo.type = PHOTO_JPEG;</div><div class='del'>-	c-&gt;logo.type  = PHOTO_JPEG;</div><div class='del'>-	c-&gt;rev.utc    = -1;</div><div class='del'>-	c-&gt;sound.type = SOUND_PHONETIC;</div><div class='del'>-	c-&gt;key.type   = KEY_PGP;</div><div class='del'>-</div><div class='del'>-	c-&gt;categories.prop.encod = ENC_QUOTED_PRINTABLE;</div><div class='del'>-	c-&gt;comment.prop.encod    = ENC_QUOTED_PRINTABLE;</div><div class='del'>-	</div><div class='del'>-	c-&gt;name.prop   = c-&gt;photo.prop = c-&gt;bday.prop     = c-&gt;timezn.prop   = </div><div class='del'>-	c-&gt;geopos.prop = c-&gt;logo.prop  = c-&gt;org.prop      = c-&gt;rev.prop      =</div><div class='del'>-	c-&gt;sound.prop  = c-&gt;key.prop   = c-&gt;deladdr.prop  = c-&gt;dellabel.prop =</div><div class='del'>-	c-&gt;phone.prop  = c-&gt;email.prop = c-&gt;xtension.prop = c-&gt;prop = e_card_prop_empty ();</div><div class='del'>-	</div><div class='del'>-	c-&gt;prop.type            = PROP_CARD;</div><div class='del'>-	c-&gt;fname.prop.type      = PROP_FNAME;</div><div class='del'>-	c-&gt;name.prop.type       = PROP_NAME;</div><div class='del'>-	c-&gt;photo.prop.type      = PROP_PHOTO;</div><div class='del'>-	c-&gt;bday.prop.type       = PROP_BDAY;</div><div class='del'>-	</div><div class='del'>-	c-&gt;deladdr.prop.type    = PROP_DELADDR_LIST;</div><div class='del'>-	c-&gt;dellabel.prop.type   = PROP_DELLABEL_LIST;</div><div class='del'>-	c-&gt;phone.prop.type      = PROP_PHONE_LIST;</div><div class='del'>-	c-&gt;email.prop.type      = PROP_EMAIL_LIST;</div><div class='del'>-	c-&gt;xtension.prop.type   = PROP_XTENSION_LIST;</div><div class='del'>-	c-&gt;mailer.prop.type     = PROP_MAILER;</div><div class='del'>-	c-&gt;timezn.prop.type     = PROP_TIMEZN;</div><div class='del'>-	c-&gt;geopos.prop.type     = PROP_GEOPOS;</div><div class='del'>-	c-&gt;role.prop.type       = PROP_ROLE;</div><div class='del'>-	c-&gt;logo.prop.type       = PROP_LOGO;</div><div class='del'>-	c-&gt;org.prop.type        = PROP_ORG;</div><div class='del'>-	c-&gt;categories.prop.type = PROP_CATEGORIES;</div><div class='del'>-	c-&gt;comment.prop.type    = PROP_COMMENT;</div><div class='del'>-	c-&gt;rev.prop.type        = PROP_REV;</div><div class='del'>-	c-&gt;sound.prop.type      = PROP_SOUND;</div><div class='del'>-	c-&gt;uid.prop.type 	= PROP_UID;</div><div class='del'>-	c-&gt;key.prop.type 	= PROP_KEY;</div><div class='del'>-	</div><div class='del'>-	return c;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-assign_string(VObject *vobj, char **string)</div><div class='del'>-{</div><div class='del'>-	int type = vObjectValueType(vobj);</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VCVT_STRINGZ:</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 = (vObjectValueType (vobj) ? fakeCString (vObjectUStringZValue (vobj)) : calloc(1, 1));</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'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-e_card_str_free (CardStrProperty *sp)</div><div class='del'>-{</div><div class='del'>-	g_free (sp-&gt;str);</div><div class='del'>-</div><div class='del'>-	e_card_prop_free (sp-&gt;prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_photo_free (CardPhoto *photo)</div><div class='del'>-{</div><div class='del'>-	g_free (photo-&gt;data);</div><div class='del'>-</div><div class='del'>-	e_card_prop_free (photo-&gt;prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_free:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_card_free (ECard *card)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (card != NULL);</div><div class='del'>-</div><div class='del'>-	e_card_name_free (&amp; card-&gt;name);</div><div class='del'>-	e_card_str_free  (&amp; card-&gt;fname);</div><div class='del'>-</div><div class='del'>-	e_card_photo_free (card-&gt;photo);</div><div class='del'>-</div><div class='del'>-	e_card_logo_free (card-&gt;logo);</div><div class='del'>-	e_card_org_free (card-&gt;org);</div><div class='del'>-	e_card_key_free (card-&gt;key);</div><div class='del'>-	e_card_sound_free (card-&gt;sound);</div><div class='del'>-</div><div class='del'>-	e_card_prop_str_free (&amp; card-&gt;mailer);</div><div class='del'>-	e_card_prop_str_free (&amp; card-&gt;role);</div><div class='del'>-	e_card_prop_str_free (&amp; card-&gt;categories);</div><div class='del'>-	e_card_prop_str_free (&amp; card-&gt;comment);</div><div class='del'>-	e_card_prop_str_free (&amp; card-&gt;uid);</div><div class='del'>-</div><div class='del'>-	/* address is a little more complicated */</div><div class='del'>-	card_prop_free (card-&gt;deladdr.prop);</div><div class='del'>-	while ((l = card-&gt;deladdr.l)) {</div><div class='del'>-</div><div class='del'>-		e_card_deladdr_free ((CardDelAddr *) l-&gt;data);</div><div class='del'>-</div><div class='del'>-		card-&gt;deladdr.l = g_list_remove_link (card-&gt;deladdr.l, l);</div><div class='del'>-		g_list_free (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	char c;</div><div class='del'>-	int id;</div><div class='del'>-	</div><div class='del'>-	GList *sons;</div><div class='del'>-} tree;</div><div class='del'>-</div><div class='del'>-extern CardProperty </div><div class='del'>-e_card_prop_empty (void)</div><div class='del'>-{</div><div class='del'>-	CardProperty prop;</div><div class='del'>-	</div><div class='del'>-	prop.used = FALSE;</div><div class='del'>-	</div><div class='del'>-	prop.type = PROP_NONE;</div><div class='del'>-	prop.encod = ENC_7BIT;</div><div class='del'>-	prop.value = VAL_INLINE;</div><div class='del'>-	prop.charset = NULL;</div><div class='del'>-	prop.lang = NULL;</div><div class='del'>-	prop.grp = NULL;</div><div class='del'>-	prop.xtension = NULL;</div><div class='del'>-	</div><div class='del'>-	prop.user_data = NULL;</div><div class='del'>-	</div><div class='del'>-	return prop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardStrProperty </div><div class='del'>-e_card_prop_str_empty (void)</div><div class='del'>-{</div><div class='del'>-	CardStrProperty strprop;</div><div class='del'>-	</div><div class='del'>-	strprop.prop = card_prop_empty ();</div><div class='del'>-	strprop.str = NULL;</div><div class='del'>-	</div><div class='del'>-	return strprop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Intended to check asserts. */</div><div class='del'>-extern int card_check_prop (ECardProperty prop)</div><div class='del'>-{</div><div class='del'>-	if (((prop.used == FALSE) || (prop.used == TRUE)) &amp;&amp;</div><div class='del'>-	    ((prop.type &gt;= PROP_NONE) &amp;&amp; (prop.type &lt;= PROP_LAST)) &amp;&amp;</div><div class='del'>-	    ((prop.encod &gt;= ENC_NONE) &amp;&amp; (prop.encod &lt;= ENC_LAST)) &amp;&amp;</div><div class='del'>-	    ((prop.value &gt;= VAL_NONE) &amp;&amp; (prop.value &lt;= VAL_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'>-extern void</div><div class='del'>-card_prop_free (CardProperty prop)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	g_free (prop.charset);</div><div class='del'>-	g_free (prop.lang);</div><div class='del'>-	</div><div class='del'>-	for (l = prop.xtension; l; l = l-&gt;next) {</div><div class='del'>-		CardXAttribute *xa = (CardXAttribute *) l-&gt;data;</div><div class='del'>-		g_free (xa-&gt;name);</div><div class='del'>-		g_free (xa-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_list_free (l);</div><div class='del'>-	</div><div class='del'>-	prop.used = FALSE;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-e_card_deladdr_free (ECardDelAddr *c)</div><div class='del'>-{</div><div class='del'>-	card_prop_free (c-&gt;prop);</div><div class='del'>-</div><div class='del'>-	g_free (p-&gt;pobox);</div><div class='del'>-	g_free (p-&gt;ext);</div><div class='del'>-	g_free (p-&gt;street);</div><div class='del'>-	g_free (p-&gt;city);</div><div class='del'>-	g_free (p-&gt;region);</div><div class='del'>-	g_free (p-&gt;code);</div><div class='del'>-	g_free (p-&gt;country);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-card_free (Card *crd)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static tree *</div><div class='del'>-new_tree (char c, int id)</div><div class='del'>-{</div><div class='del'>-	tree *t;</div><div class='del'>-	</div><div class='del'>-	t = malloc (sizeof (tree));</div><div class='del'>-	t-&gt;c = c;</div><div class='del'>-	t-&gt;id = id;</div><div class='del'>-	t-&gt;sons = NULL;</div><div class='del'>-	</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-add_branch (tree *t, char *str, int id)</div><div class='del'>-{</div><div class='del'>-	tree *tmp;</div><div class='del'>-	char *end;</div><div class='del'>-	</div><div class='del'>-	end = str + strlen (str) + 1;</div><div class='del'>-</div><div class='del'>-	while (str != end) {</div><div class='del'>-		tmp = new_tree (*str, id);</div><div class='del'>-		t-&gt;sons = g_list_append (t-&gt;sons, (gpointer) tmp);</div><div class='del'>-		t = tmp;</div><div class='del'>-		</div><div class='del'>-		str ++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static tree *</div><div class='del'>-add_to_tree (tree *t, struct pair p)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	char *c, *end;</div><div class='del'>-	tree *tmp;</div><div class='del'>-	</div><div class='del'>-	  c = p.str;</div><div class='del'>-	end = c + strlen (c) + 1;</div><div class='del'>-	tmp = t;</div><div class='del'>-	</div><div class='del'>-	while (c != end) {</div><div class='del'>-		for (node = tmp-&gt;sons; node; node = node-&gt;next)</div><div class='del'>-		  if (((tree *) node-&gt;data)-&gt;c == *c) {</div><div class='del'>-			  break;</div><div class='del'>-		  }</div><div class='del'>-		</div><div class='del'>-		if (node) {</div><div class='del'>-			tmp = (tree *) node-&gt;data;</div><div class='del'>-			tmp-&gt;id = 0;</div><div class='del'>-			c++;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			add_branch (tmp, c, p.id);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-static tree *</div><div class='del'>-create_search_tree (void)</div><div class='del'>-{</div><div class='del'>-	tree *t;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	t = new_tree (0, 0);</div><div class='del'>-	for (i = 0; prop_lookup[i].str; i++)</div><div class='del'>-	  t = add_to_tree (t, prop_lookup[i]);</div><div class='del'>-	</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-static int </div><div class='del'>-card_lookup_name (const char *c)</div><div class='del'>-{</div><div class='del'>-	static tree *search_tree = NULL;</div><div class='del'>-	GList *node;</div><div class='del'>-	tree *tmp;</div><div class='del'>-	const char *end;</div><div class='del'>-	</div><div class='del'>-	if (!search_tree)</div><div class='del'>-	  search_tree = create_search_tree ();</div><div class='del'>-	</div><div class='del'>-	tmp = search_tree;</div><div class='del'>-	end = c + strlen (c) + 1;</div><div class='del'>-	</div><div class='del'>-	while (tmp-&gt;id == 0 &amp;&amp; c != end) {</div><div class='del'>-		for (node = tmp-&gt;sons; node; node = node-&gt;next)</div><div class='del'>-		  if (((tree *) node-&gt;data)-&gt;c == *c) {</div><div class='del'>-			  break;</div><div class='del'>-		  }</div><div class='del'>-	</div><div class='del'>-		if (node) {</div><div class='del'>-			tmp = (tree *) node-&gt;data;</div><div class='del'>-			c++;</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'>-	return tmp-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum PhotoType </div><div class='del'>-get_photo_type (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; photo_pairs[i].str; i++)</div><div class='del'>-	  if (has (o, photo_pairs[i].str))</div><div class='del'>-	    return photo_pairs[i].id;</div><div class='del'>-</div><div class='del'>-	g_warning ("? &lt; No PhotoType for Photo property. Falling back to JPEG.");</div><div class='del'>-	return PHOTO_JPEG;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardProperty </div><div class='del'>-get_CardProperty (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObjectIterator i;</div><div class='del'>-	CardProperty prop;</div><div class='del'>-</div><div class='del'>-	prop = card_prop_empty ();</div><div class='del'>-	prop.used = TRUE;</div><div class='del'>-	</div><div class='del'>-	initPropIterator (&amp;i, o);</div><div class='del'>-	while (moreIteration (&amp;i)) {</div><div class='del'>-		VObject *vo = nextVObject (&amp;i);</div><div class='del'>-		const char *n = vObjectName (vo);</div><div class='del'>-		int propid;</div><div class='del'>-	</div><div class='del'>-		propid = card_lookup_name (n);</div><div class='del'>-		</div><div class='del'>-		switch (propid) {</div><div class='del'>-			</div><div class='del'>-		 case PROP_VALUE:</div><div class='del'>-		</div><div class='del'>-			if (has (vo, VCContentIDProp))</div><div class='del'>-			  prop.value = VAL_CID;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		 case PROP_ENCODING:</div><div class='del'>-			if (has (vo, VCQuotedPrintableProp))</div><div class='del'>-			  prop.encod = ENC_QUOTED_PRINTABLE;</div><div class='del'>-			else if (has (vo, VC8bitProp))</div><div class='del'>-			  prop.encod = ENC_8BIT;</div><div class='del'>-			else if (has (vo, VCBase64Prop))</div><div class='del'>-			  prop.encod = ENC_BASE64;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		 case PROP_QUOTED_PRINTABLE:</div><div class='del'>-			prop.encod = ENC_QUOTED_PRINTABLE;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		 case PROP_8BIT:</div><div class='del'>-			prop.encod = ENC_8BIT;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		 case PROP_BASE64:</div><div class='del'>-			prop.encod = ENC_BASE64;</div><div class='del'>-			break;</div><div class='del'>-	</div><div class='del'>-		 case PROP_LANG:</div><div class='del'>-			if (vObjectValueType (vo)) {</div><div class='del'>-				prop.lang = </div><div class='del'>-				  g_strdup (vObjectStringZValue (vo));</div><div class='del'>-			} else</div><div class='del'>-			  g_warning ("? &lt; No value for LANG attribute.");</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		 case PROP_CHARSET:</div><div class='del'>-			if (vObjectValueType (vo)) {</div><div class='del'>-				prop.charset = </div><div class='del'>-				  g_strdup (vObjectStringZValue (vo));</div><div class='del'>-				g_warning (prop.charset); </div><div class='del'>-			} else</div><div class='del'>-			  g_warning ("? &lt; No value for CHARSET attribute.");</div><div class='del'>-			break;</div><div class='del'>-		 default:</div><div class='del'>-				{</div><div class='del'>-					CardXAttribute *c;</div><div class='del'>-</div><div class='del'>-					c = malloc (sizeof (CardXAttribute));</div><div class='del'>-					c-&gt;name = g_strdup (n);</div><div class='del'>-					</div><div class='del'>-					if (vObjectValueType (vo))</div><div class='del'>-					  c-&gt;data = </div><div class='del'>-					  g_strdup (vObjectStringZValue (vo));</div><div class='del'>-					else</div><div class='del'>-					  c-&gt;data = NULL;</div><div class='del'>-					</div><div class='del'>-					prop.xtension = </div><div class='del'>-					  g_list_append (prop.xtension, c);</div><div class='del'>-				}</div><div class='del'>-		}</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 gboolean</div><div class='del'>-e_card_prop_has (VObject    *o,</div><div class='del'>-		 const char *id)</div><div class='del'>-{</div><div class='del'>-	g_assert (o  != NULL);</div><div class='del'>-	g_assert (id != NULL);</div><div class='del'>-</div><div class='del'>-	if (isAPropertyOf (o, id) == NULL)</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 const char *</div><div class='del'>-e_card_prop_get_str (VObject    *o,</div><div class='del'>-		     const char *id)</div><div class='del'>-{</div><div class='del'>-	VObject *strobj;</div><div class='del'>-</div><div class='del'>-	g_assert (o  != NULL);</div><div class='del'>-	g_assert (id != NULL);</div><div class='del'>-</div><div class='del'>-	strobj = isAPropertyOf (o, id);</div><div class='del'>-</div><div class='del'>-	if (strobj == NULL)</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-</div><div class='del'>-	if (vObjectValueType (strobj) != NULL) {</div><div class='del'>-		char *str;</div><div class='del'>-		char *g_str;</div><div class='del'>-</div><div class='del'>-		str = fakeCString (vObjectStringZValue (strobj));</div><div class='del'>-		g_str = g_strdup (str);</div><div class='del'>-		free (str);</div><div class='del'>-</div><div class='del'>-		return g_str;</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 ECardName *</div><div class='del'>-e_card_get_name (VObject *o)</div><div class='del'>-{</div><div class='del'>-	CardName *name;</div><div class='del'>-	VObject *vo;</div><div class='del'>-	char *the_str;</div><div class='del'>-</div><div class='del'>-	name = g_new0 (ECardName, 1);</div><div class='del'>-</div><div class='del'>-	name-&gt;family     = e_card_prop_get_substr (o, VCFamilyNameProp);</div><div class='del'>-	name-&gt;given      = e_card_prop_get_substr (o, VCGivenNameProp);</div><div class='del'>-	name-&gt;additional = e_card_prop_get_substr (o, VCAdditionalNamesProp);</div><div class='del'>-	name-&gt;prefix     = e_card_prop_get_substr (o, VCNamePrefixesProp);</div><div class='del'>-	name-&gt;suffix     = e_card_prop_get_substr (o, VCNameSuffixesProp);</div><div class='del'>-</div><div class='del'>-	return name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardDelLabel *</div><div class='del'>-get_CardDelLabel (VObject *o)</div><div class='del'>-{</div><div class='del'>-	CardDelLabel *dellabel;</div><div class='del'>-	char *the_str;</div><div class='del'>-	</div><div class='del'>-	dellabel = malloc (sizeof (CardDelLabel));</div><div class='del'>-	</div><div class='del'>-	dellabel-&gt;type = get_addr_type (o);</div><div class='del'>-	dellabel-&gt;data = g_strdup (str_val (o));</div><div class='del'>-	</div><div class='del'>-	free (the_str);</div><div class='del'>-	return dellabel;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardPhone *</div><div class='del'>-get_CardPhone (VObject *o)</div><div class='del'>-{</div><div class='del'>-	CardPhone *ret;</div><div class='del'>-	char *the_str;</div><div class='del'>-	</div><div class='del'>-	ret = malloc (sizeof (CardPhone));</div><div class='del'>-	ret-&gt;type = get_phone_type (o);</div><div class='del'>-	ret-&gt;data = g_strdup (str_val (o));</div><div class='del'>-	</div><div class='del'>-	free (the_str);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardEMail *</div><div class='del'>-get_CardEMail (VObject *o)</div><div class='del'>-{</div><div class='del'>-	CardEMail *ret;</div><div class='del'>-	char *the_str; </div><div class='del'>-	</div><div class='del'>-	ret = malloc (sizeof (CardEMail)); </div><div class='del'>-	ret-&gt;type = get_email_type (o);</div><div class='del'>-	ret-&gt;data = g_strdup (str_val (o));</div><div class='del'>-	</div><div class='del'>-	free (the_str);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static CardTimeZone </div><div class='del'>-strtoCardTimeZone (char *str)</div><div class='del'>-{</div><div class='del'>-	char s[3];</div><div class='del'>-	CardTimeZone tz;</div><div class='del'>-	</div><div class='del'>-	if (*str == '-') {</div><div class='del'>-		tz.sign = -1;</div><div class='del'>-		str++;</div><div class='del'>-	} else</div><div class='del'>-	  tz.sign = 1;</div><div class='del'>-	</div><div class='del'>-	tz.hours = 0;</div><div class='del'>-	tz.mins = 0;</div><div class='del'>-	</div><div class='del'>-	s[2] = 0;</div><div class='del'>-	if (strlen (str) &gt; 2) {</div><div class='del'>-		s[0] = str[0];</div><div class='del'>-		s[1] = str[1];</div><div class='del'>-		tz.hours = atoi (s);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("? &lt; TimeZone value is too short.");</div><div class='del'>-		return tz;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	str += 2;</div><div class='del'>-	if (*str == ':')</div><div class='del'>-	  str++;</div><div class='del'>-	</div><div class='del'>-	if (strlen (str) &gt;= 2) {</div><div class='del'>-		s[0] = str[0];</div><div class='del'>-		s[1] = str[1];</div><div class='del'>-		tz.mins = atoi (s);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("? &lt; TimeZone value is too short.");</div><div class='del'>-		return tz;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (strlen (str) &gt; 3)</div><div class='del'>-		g_warning ("? &lt; TimeZone value is too long.");</div><div class='del'>-</div><div class='del'>-	return tz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardGeoPos </div><div class='del'>-strtoCardGeoPos (char *str)</div><div class='del'>-{</div><div class='del'>-	CardGeoPos gp;</div><div class='del'>-	char *s;</div><div class='del'>-	</div><div class='del'>-	gp.lon = 0;</div><div class='del'>-	gp.lat = 0;</div><div class='del'>-	  </div><div class='del'>-	s = strchr (str, ',');</div><div class='del'>-	</div><div class='del'>-	if (! s) {</div><div class='del'>-		g_warning ("? &lt; Bad format for GeoPos property.");</div><div class='del'>-		return gp;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*s = 0;</div><div class='del'>-	s++;</div><div class='del'>-	</div><div class='del'>-	gp.lon = atof (str);</div><div class='del'>-	gp.lat = atof (s);</div><div class='del'>-	</div><div class='del'>-	return gp;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static CardOrg *</div><div class='del'>-e_card_vobject_to_org (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	char *the_str;</div><div class='del'>-	CardOrg *org;</div><div class='del'>-</div><div class='del'>-	org = g_new0 (CardOrg, 1);</div><div class='del'>-</div><div class='del'>-	if (has (o, VCOrgNameProp)) {</div><div class='del'>-		org.name = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	if (has (o, VCOrgUnitProp)) {</div><div class='del'>-		org.unit1 = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	if (has (o, VCOrgUnit2Prop)) {</div><div class='del'>-		org.unit2 = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	if (has (o, VCOrgUnit3Prop)) {</div><div class='del'>-		org.unit3 = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	if (has (o, VCOrgUnit4Prop)) {</div><div class='del'>-		org.unit4 = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return org;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardXProperty *</div><div class='del'>-get_XProp (VObject *o)</div><div class='del'>-{</div><div class='del'>-	char *the_str;</div><div class='del'>-	CardXProperty *ret;</div><div class='del'>-	</div><div class='del'>-	ret = malloc (sizeof (CardXProperty)); </div><div class='del'>-	ret-&gt;name = g_strdup (vObjectName (o));</div><div class='del'>-	ret-&gt;data = g_strdup (str_val (o));</div><div class='del'>-	free (the_str);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardRev </div><div class='del'>-strtoCardRev (char *str)</div><div class='del'>-{</div><div class='del'>-	char s[3], *t, *ss;</div><div class='del'>-	int len, i;</div><div class='del'>-	CardRev rev;</div><div class='del'>-	</div><div class='del'>-	rev.utc = 0;</div><div class='del'>-	len = strlen (str);</div><div class='del'>-	</div><div class='del'>-	if (str[len] == 'Z') {              /* Is it UTC? */</div><div class='del'>-		rev.utc = 1;</div><div class='del'>-		str[len] = 0;</div><div class='del'>-	}</div><div class='del'>-	  </div><div class='del'>-	s[2] = 0;</div><div class='del'>-	t = strchr (str, 'T');</div><div class='del'>-	if (t) {                            /* Take the Time */</div><div class='del'>-		*t = 0;</div><div class='del'>-		t++;</div><div class='del'>-		if (strlen (t) &gt; 2) {</div><div class='del'>-			s[0] = t[0];</div><div class='del'>-			s[1] = t[1];</div><div class='del'>-			rev.tm.tm_hour = atoi (s);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("? &lt; Rev value is too short.");</div><div class='del'>-			return rev;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		t += 2;</div><div class='del'>-		if (*t == ':')             /* Ignore ':' separator */</div><div class='del'>-		  t++;</div><div class='del'>-		</div><div class='del'>-		if (strlen (t) &gt; 2) {</div><div class='del'>-			s[0] = t[0];</div><div class='del'>-			s[1] = t[1];</div><div class='del'>-			rev.tm.tm_min = atoi (s);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("? &lt; Rev value is too short.");</div><div class='del'>-			return rev;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		t += 2;</div><div class='del'>-		if (*t == ':')</div><div class='del'>-		  t++;</div><div class='del'>-		</div><div class='del'>-		if (strlen (t) &gt; 2) {</div><div class='del'>-			s[0] = t[0];</div><div class='del'>-			s[1] = t[1];</div><div class='del'>-			rev.tm.tm_sec = atoi (s);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("? &lt; Rev value is too short.");</div><div class='del'>-			return rev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (strlen (str) &gt; 3)</div><div class='del'>-		  g_warning ("? &lt; Rev value is too long.");</div><div class='del'>-		</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("? &lt; No time value for Rev property.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now the date (the part before the T) */</div><div class='del'>-	</div><div class='del'>-	if (strchr (str, '-')) {                        /* extended iso 8601 */</div><div class='del'>-		for (ss = strtok (str, "-"), i = 0; ss;</div><div class='del'>-		     ss = strtok (NULL, "-"), i++)</div><div class='del'>-		  switch (i) {</div><div class='del'>-		   case 0:</div><div class='del'>-			  rev.tm.tm_year = atoi (ss);</div><div class='del'>-			  break;</div><div class='del'>-		   case 1:</div><div class='del'>-			  rev.tm.tm_mon = atoi (ss);</div><div class='del'>-			  break;</div><div class='del'>-		   case 2:</div><div class='del'>-			  rev.tm.tm_mday = atoi (ss);</div><div class='del'>-			  break;</div><div class='del'>-		   default:</div><div class='del'>-			  g_warning ("? &lt; Too many values for Rev property.");</div><div class='del'>-		  }</div><div class='del'>-		</div><div class='del'>-		if (i &lt; 2)</div><div class='del'>-		  g_warning ("? &lt; Too few values for Rev property.");</div><div class='del'>-	} else {</div><div class='del'>-		if (strlen (str) &gt;= 8) {             /* short representation */</div><div class='del'>-			rev.tm.tm_mday = atoi (str + 6);</div><div class='del'>-			str[6] = 0;</div><div class='del'>-			rev.tm.tm_mon = atoi (str + 4);</div><div class='del'>-			str[4] = 0;</div><div class='del'>-			rev.tm.tm_year = atoi (str);</div><div class='del'>-		} else</div><div class='del'>-		  g_warning ("? &lt; Bad format for Rev property.");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return rev;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-static enum KeyType </div><div class='del'>-get_key_type (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; key_pairs[i].str; i++)</div><div class='del'>-	  if (has (o, key_pairs[i].str))</div><div class='del'>-	    return key_pairs[i].id;</div><div class='del'>-</div><div class='del'>-	g_warning ("? &lt; No KeyType for Key property. Falling back to PGP.");</div><div class='del'>-	return KEY_PGP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CardPhoto </div><div class='del'>-get_CardPhoto (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	char *the_str;</div><div class='del'>-	CardPhoto photo;</div><div class='del'>-</div><div class='del'>-	photo.type = get_photo_type (o);</div><div class='del'>-	</div><div class='del'>-	if (has (o, VCDataSizeProp)) {</div><div class='del'>-		photo.size = vObjectIntegerValue (vo);</div><div class='del'>-		photo.data = malloc (photo.size);</div><div class='del'>-		memcpy (photo.data, vObjectAnyValue (o), photo.size);</div><div class='del'>-	} else {</div><div class='del'>-		photo.size = strlen (str_val (o)) + 1;</div><div class='del'>-		photo.data = g_strdup (the_str);</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return photo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum SoundType </div><div class='del'>-get_sound_type (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; sound_pairs[i].str; i++)</div><div class='del'>-	  if (has (o, sound_pairs[i].str))</div><div class='del'>-	    return sound_pairs[i].id;</div><div class='del'>-</div><div class='del'>-	return SOUND_PHONETIC;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static CardSound </div><div class='del'>-get_CardSound (VObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	char *the_str;</div><div class='del'>-	CardSound sound;</div><div class='del'>-</div><div class='del'>-	sound.type = get_sound_type (o);</div><div class='del'>-	</div><div class='del'>-	if (has (o, VCDataSizeProp)) {</div><div class='del'>-		sound.size = vObjectIntegerValue (vo);</div><div class='del'>-		sound.data = malloc (sound.size);</div><div class='del'>-		memcpy (sound.data, vObjectAnyValue (o), sound.size);</div><div class='del'>-	} else {</div><div class='del'>-		sound.size = strlen (str_val (o));</div><div class='del'>-		sound.data = g_strdup (the_str);</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return sound;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads our card contents from a VObject */</div><div class='del'>-static ECard *</div><div class='del'>-e_card_construct_from_vobject (ECard   *card,</div><div class='del'>-			       VObject *vcrd)</div><div class='del'>-{</div><div class='del'>-	VObjectIterator i;</div><div class='del'>-	Card *crd;</div><div class='del'>-	char *the_str;</div><div class='del'>-</div><div class='del'>-	initPropIterator (&amp;i, vcrd);</div><div class='del'>-	crd = card_new ();</div><div class='del'>-</div><div class='del'>-	while (moreIteration (&amp;i)) {</div><div class='del'>-		VObject *o = nextVObject (&amp;i);</div><div class='del'>-		const char *n = vObjectName (o);</div><div class='del'>-		int propid;</div><div class='del'>-		CardProperty *prop = NULL;</div><div class='del'>-</div><div class='del'>-		propid = card_lookup_name (n);</div><div class='del'>-		</div><div class='del'>-		switch (propid) {</div><div class='del'>-		case PROP_FNAME:</div><div class='del'>-			prop = &amp;crd-&gt;fname.prop;</div><div class='del'>-			crd-&gt;fname.str = g_strdup (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_NAME:</div><div class='del'>-			prop = &amp;crd-&gt;name.prop;</div><div class='del'>-			crd-&gt;name = e_card_get_name (o);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_PHOTO:</div><div class='del'>-			prop = &amp;crd-&gt;photo.prop;</div><div class='del'>-			crd-&gt;photo = get_CardPhoto (o);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_BDAY:</div><div class='del'>-			prop = &amp;crd-&gt;bday.prop;</div><div class='del'>-			crd-&gt;bday = strtoCardBDay (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_DELADDR:</div><div class='del'>-				{</div><div class='del'>-					CardDelAddr *c;</div><div class='del'>-					c = get_CardDelAddr (o);</div><div class='del'>-					prop = &amp;c-&gt;prop;</div><div class='del'>-					crd-&gt;deladdr.l = g_list_append (crd-&gt;deladdr.l, c);</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_DELLABEL:</div><div class='del'>-				{</div><div class='del'>-					CardDelLabel *c;</div><div class='del'>-					c = get_CardDelLabel (o);</div><div class='del'>-					prop = &amp;c-&gt;prop;</div><div class='del'>-					crd-&gt;dellabel.l = g_list_append (crd-&gt;dellabel.l, c);</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_PHONE:</div><div class='del'>-				{</div><div class='del'>-					CardPhone *c;</div><div class='del'>-					</div><div class='del'>-					c = get_CardPhone (o);</div><div class='del'>-					prop = &amp;c-&gt;prop;</div><div class='del'>-					crd-&gt;phone.l = g_list_append (crd-&gt;phone.l, c);</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_EMAIL:</div><div class='del'>-				{</div><div class='del'>-					CardEMail *c;</div><div class='del'>-					</div><div class='del'>-					c = get_CardEMail (o);</div><div class='del'>-					prop = &amp;c-&gt;prop;</div><div class='del'>-					crd-&gt;email.l = g_list_append (crd-&gt;email.l, c);</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_MAILER:</div><div class='del'>-			prop = &amp;crd-&gt;mailer.prop;</div><div class='del'>-			crd-&gt;mailer.str = g_strdup (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_TIMEZN:</div><div class='del'>-			prop = &amp;crd-&gt;timezn.prop;</div><div class='del'>-			crd-&gt;timezn = strtoCardTimeZone (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_GEOPOS:</div><div class='del'>-			prop = &amp;crd-&gt;geopos.prop;</div><div class='del'>-			crd-&gt;geopos = strtoCardGeoPos (str_val (o));</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_ROLE:</div><div class='del'>-			prop = &amp;crd-&gt;role.prop;</div><div class='del'>-			crd-&gt;role.str = g_strdup (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_LOGO:</div><div class='del'>-			prop = &amp;crd-&gt;logo.prop;</div><div class='del'>-			crd-&gt;logo = get_CardPhoto (o);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_AGENT:</div><div class='del'>-			crd-&gt;agent = card_create_from_vobject (o);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_ORG:</div><div class='del'>-			prop = &amp;crd-&gt;org.prop;</div><div class='del'>-			crd-&gt;org = get_CardOrg (o);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_CATEGORIES:</div><div class='del'>-			prop = &amp;crd-&gt;categories.prop;</div><div class='del'>-			crd-&gt;categories.str = g_strdup (str_val (o));</div><div class='del'>-			crd-&gt;categories.prop.encod = ENC_QUOTED_PRINTABLE;</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_COMMENT:</div><div class='del'>-			prop = &amp;crd-&gt;comment.prop;</div><div class='del'>-			crd-&gt;comment.str = g_strdup (str_val (o));</div><div class='del'>-			crd-&gt;comment.prop.encod = ENC_QUOTED_PRINTABLE;</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_REV:</div><div class='del'>-			prop = &amp;crd-&gt;rev.prop;</div><div class='del'>-			crd-&gt;rev = strtoCardRev (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_SOUND:</div><div class='del'>-			prop = &amp;crd-&gt;sound.prop;</div><div class='del'>-			crd-&gt;sound = get_CardSound (o);</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_VERSION:</div><div class='del'>-				{</div><div class='del'>-					char *str;</div><div class='del'>-					str = str_val (o);</div><div class='del'>-					if (strcmp (str, "2.1"))</div><div class='del'>-					  g_warning ("? &lt; Version doesn't match.");</div><div class='del'>-					free (the_str);</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		 case PROP_KEY:</div><div class='del'>-			prop = &amp;crd-&gt;key.prop;</div><div class='del'>-			crd-&gt;key.type = get_key_type (o);</div><div class='del'>-			crd-&gt;key.data = g_strdup (str_val (o));</div><div class='del'>-			free (the_str);</div><div class='del'>-			break;</div><div class='del'>-		 default:</div><div class='del'>-				{</div><div class='del'>-					CardXProperty *c;</div><div class='del'>-				</div><div class='del'>-					c = get_XProp (o);</div><div class='del'>-					prop = &amp;c-&gt;prop;</div><div class='del'>-					crd-&gt;xtension.l = g_list_append (crd-&gt;xtension.l, c);</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (prop) {</div><div class='del'>-			*prop = get_CardProperty (o);</div><div class='del'>-			prop-&gt;type = propid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return crd;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-/* Loads a card from a file */</div><div class='del'>-GList *</div><div class='del'>-card_load (GList *crdlist, char *fname)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj, *tmp;</div><div class='del'>-	</div><div class='del'>-	vobj = Parse_MIME_FromFileName (fname);</div><div class='del'>-	if (!vobj) {</div><div class='del'>-		g_warning ("Could not load the cardfile");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (vobj) {</div><div class='del'>-		const char *n = vObjectName (vobj);</div><div class='del'>-		</div><div class='del'>-		if (strcmp (n, VCCardProp) == 0) {</div><div class='del'>-			crdlist = g_list_append (crdlist, (gpointer)</div><div class='del'>-					    card_create_from_vobject (vobj));</div><div class='del'>-		}</div><div class='del'>-		tmp = vobj;</div><div class='del'>-		vobj = nextVObjectInList (vobj);</div><div class='del'>-		cleanVObject (tmp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cleanVObject (vobj);</div><div class='del'>-	cleanStrTbl ();</div><div class='del'>-	return crdlist;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_strProp (VObject *o, const char *id, char *val)</div><div class='del'>-{</div><div class='del'>-	VObject *vo = NULL;</div><div class='del'>-	</div><div class='del'>-	if (val)</div><div class='del'>-	  vo = addPropValue (o, id, val);</div><div class='del'>-</div><div class='del'>-	return vo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_CardProperty (VObject *o, CardProperty *prop)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	</div><div class='del'>-	switch (prop-&gt;encod) {</div><div class='del'>-	 case ENC_BASE64:</div><div class='del'>-		addProp (o, VCBase64Prop);</div><div class='del'>-		break;</div><div class='del'>-	 case ENC_QUOTED_PRINTABLE:</div><div class='del'>-		addProp (o, VCQuotedPrintableProp);</div><div class='del'>-		break;</div><div class='del'>-	 case ENC_8BIT:</div><div class='del'>-		addProp (o, VC8bitProp);</div><div class='del'>-		break;</div><div class='del'>-	 case ENC_7BIT:</div><div class='del'>-		/* Do nothing: 7BIT is the default. Avoids file clutter. */</div><div class='del'>-		break;</div><div class='del'>-	 default:</div><div class='del'>-		g_warning ("? &lt; Card had invalid encoding type.");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (prop-&gt;value) {</div><div class='del'>-	 case VAL_CID:</div><div class='del'>-		addProp (o, VCContentIDProp);</div><div class='del'>-		break;</div><div class='del'>-	 case VAL_INLINE:</div><div class='del'>-		/* Do nothing: INLINE is the default. Avoids file clutter. */</div><div class='del'>-		break;</div><div class='del'>-	 default:</div><div class='del'>-		g_warning ("? &lt; Card had invalid value type.");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (node = prop-&gt;xtension; node; node = node-&gt;next) {</div><div class='del'>-		CardXAttribute *xa = (CardXAttribute *) node-&gt;data;</div><div class='del'>-		if (xa-&gt;data)</div><div class='del'>-		  addPropValue (o, xa-&gt;name, xa-&gt;data);</div><div class='del'>-		else</div><div class='del'>-		  addProp (o, xa-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	add_strProp (o, VCCharSetProp, prop-&gt;charset);</div><div class='del'>-	add_strProp (o, VCLanguageProp, prop-&gt;lang);</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_CardStrProperty (VObject *vobj, const char *id, CardStrProperty *strprop)</div><div class='del'>-{</div><div class='del'>-	VObject *vprop;</div><div class='del'>-	</div><div class='del'>-	if (strprop-&gt;prop.used) {</div><div class='del'>-		vprop = add_strProp (vobj, id, strprop-&gt;str);</div><div class='del'>-		add_CardProperty (vprop, &amp;strprop-&gt;prop);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return vobj;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_PhotoType (VObject *o, enum PhotoType photo_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; photo_pairs[i].str; i++)</div><div class='del'>-	  if (photo_type == photo_pairs[i].id) {</div><div class='del'>-		  addProp (o, photo_pairs[i].str);</div><div class='del'>-		  return o;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	g_warning ("? &gt; No PhotoType for Photo property. Falling back to JPEG.");</div><div class='del'>-	addProp (o, VCJPEGProp);</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_AddrType (VObject *o, int addr_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; addr_pairs[i].str; i++)</div><div class='del'>-	  if (addr_type &amp; addr_pairs[i].id)</div><div class='del'>-	    addProp (o, addr_pairs[i].str);</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'>-add_strAddrType (GString *string, int addr_type)</div><div class='del'>-{</div><div class='del'>-	int i, first = 1;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (addr_type) {</div><div class='del'>-		g_string_append (string, " (");</div><div class='del'>-		</div><div class='del'>-		for (i = 0; addr_pairs[i].str; i++)</div><div class='del'>-		  if (addr_type &amp; addr_pairs[i].id) {</div><div class='del'>-			  if (!first)</div><div class='del'>-			    g_string_append (string, ", ");</div><div class='del'>-			  first = 0;</div><div class='del'>-			  str = my_cap (addr_pairs[i].str);</div><div class='del'>-			  g_string_append (string, str);</div><div class='del'>-			  g_free (str);</div><div class='del'>-		  }</div><div class='del'>-		</div><div class='del'>-		g_string_append_c (string, ')');</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_PhoneType (VObject *o, int phone_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; phone_pairs[i].str; i++)</div><div class='del'>-	  if (phone_type &amp; phone_pairs[i].id)</div><div class='del'>-	    addProp (o, phone_pairs[i].str);</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'>-add_strPhoneType (GString *string, int phone_type)</div><div class='del'>-{</div><div class='del'>-	int i, first = 1;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (phone_type) {</div><div class='del'>-		g_string_append (string, " (");</div><div class='del'>-		</div><div class='del'>-		for (i = 0; phone_pairs[i].str; i++)</div><div class='del'>-		  if (phone_type &amp; phone_pairs[i].id) {</div><div class='del'>-			  if (!first)</div><div class='del'>-			    g_string_append (string, ", ");</div><div class='del'>-			  first = 0;</div><div class='del'>-			  str = my_cap (phone_pairs[i].str);</div><div class='del'>-			  g_string_append (string, str);</div><div class='del'>-			  g_free (str);</div><div class='del'>-		  }</div><div class='del'>-		</div><div class='del'>-		g_string_append_c (string, ')');</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_EMailType (VObject *o, enum EMailType email_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; email_pairs[i].str; i++)</div><div class='del'>-	  if (email_type == email_pairs[i].id) {</div><div class='del'>-		  addProp (o, email_pairs[i].str);</div><div class='del'>-		  return o;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	g_warning ("? &gt; No EMailType for EMail property. Falling back to INET.");</div><div class='del'>-	addProp (o, VCInternetProp);</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'>-add_strEMailType (GString *string, int email_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (email_type) {</div><div class='del'>-		g_string_append (string, " (");</div><div class='del'>-		</div><div class='del'>-		for (i = 0; email_pairs[i].str; i++)</div><div class='del'>-		  if (email_type == email_pairs[i].id) {</div><div class='del'>-			  str = my_cap (email_pairs[i].str);</div><div class='del'>-			  g_string_append (string, str);</div><div class='del'>-			  g_free (str);</div><div class='del'>-			  break;</div><div class='del'>-		  }</div><div class='del'>-		</div><div class='del'>-		g_string_append_c (string, ')');</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_KeyType (VObject *o, enum KeyType key_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; key_pairs[i].str; i++)</div><div class='del'>-	  if (key_type == key_pairs[i].id) {</div><div class='del'>-		  addProp (o, key_pairs[i].str);</div><div class='del'>-		  return o;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	g_warning ("? &gt; No KeyType for Key property. Falling back to PGP.");</div><div class='del'>-	addProp (o, VCPGPProp);</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'>-add_strKeyType (GString *string, int key_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (key_type) {</div><div class='del'>-		g_string_append (string, " (");</div><div class='del'>-		</div><div class='del'>-		for (i = 0; key_pairs[i].str; i++)</div><div class='del'>-		  if (key_type == key_pairs[i].id) {</div><div class='del'>-			  str = my_cap (key_pairs[i].str);</div><div class='del'>-			  g_string_append (string, str);</div><div class='del'>-			  g_free (str);</div><div class='del'>-			  break;</div><div class='del'>-		  }</div><div class='del'>-		</div><div class='del'>-		g_string_append_c (string, ')');</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-add_SoundType (VObject *o, enum SoundType sound_type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; sound_pairs[i].str; i++)</div><div class='del'>-	  if (sound_type == sound_pairs[i].id) {</div><div class='del'>-		  addProp (o, sound_pairs[i].str);</div><div class='del'>-		  return o;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *card_timezn_str (CardTimeZone timezn)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	str = malloc (7);</div><div class='del'>-	snprintf (str, 7, (timezn.sign == -1)? "-%02d:%02d" : "%02d:%02d",</div><div class='del'>-		 timezn.hours, timezn.mins);</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *card_geopos_str (CardGeoPos geopos)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	str = malloc (15);</div><div class='del'>-	snprintf (str, 15, "%03.02f,%03.02f", geopos.lon, geopos.lat);</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void add_CardStrProperty_to_string (GString *string, char *prop_name,</div><div class='del'>-					   CardStrProperty *strprop)</div><div class='del'>-{</div><div class='del'>-	if (strprop-&gt;prop.used) {</div><div class='del'>-		if (prop_name)</div><div class='del'>-		  g_string_append (string, prop_name);</div><div class='del'>-		</div><div class='del'>-		g_string_append (string, strprop-&gt;str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void add_strProp_to_string (GString *string, char *prop_name, char *val)</div><div class='del'>-{</div><div class='del'>-	if (val) {</div><div class='del'>-		if (prop_name)</div><div class='del'>-		  g_string_append (string, prop_name);</div><div class='del'>-		</div><div class='del'>-		g_string_append (string, val);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void addProp_to_string (GString *string, char *prop_name)</div><div class='del'>-{</div><div class='del'>-	if (prop_name)</div><div class='del'>-	  g_string_append (string, prop_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-card_to_string (Card *crd)</div><div class='del'>-{</div><div class='del'>-	GString *string;</div><div class='del'>-	char *ret;</div><div class='del'>-	</div><div class='del'>-	string = g_string_new ("");</div><div class='del'>-	</div><div class='del'>-	add_CardStrProperty_to_string (string, _ ("Card: "), &amp;crd-&gt;fname);</div><div class='del'>-	if (crd-&gt;name.prop.used) {</div><div class='del'>-		addProp_to_string (string, _ ("\nName: "));</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Prefix:     "), crd-&gt;name.prefix);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Given:      "), crd-&gt;name.given);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Additional: "), crd-&gt;name.additional);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Family:     "), crd-&gt;name.family);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Suffix:     "), crd-&gt;name.suffix);</div><div class='del'>-		g_string_append_c (string, '\n');</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-/*	if (crd-&gt;photo.prop.used) {</div><div class='del'>-		addPropSizedValue (string, _ ("\nPhoto: "), </div><div class='del'>-					  crd-&gt;photo.data, crd-&gt;photo.size);</div><div class='del'>-		add_PhotoType (string, crd-&gt;photo.type);</div><div class='del'>-	}*/</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;bday.prop.used) {</div><div class='del'>-		char *date_str;</div><div class='del'>-		</div><div class='del'>-		date_str = card_bday_str (crd-&gt;bday);</div><div class='del'>-		add_strProp_to_string (string, _ ("\nBirth Date: "), date_str);</div><div class='del'>-		free (date_str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;deladdr.l) {</div><div class='del'>-		GList *node;</div><div class='del'>-		</div><div class='del'>-		for (node = crd-&gt;deladdr.l; node; node = node-&gt;next) {</div><div class='del'>-			CardDelAddr *deladdr = (CardDelAddr *) node-&gt;data;</div><div class='del'>-			</div><div class='del'>-			if (deladdr-&gt;prop.used) {</div><div class='del'>-				addProp_to_string (string, _ ("\nAddress:"));</div><div class='del'>-				add_strAddrType (string, deladdr-&gt;type);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  Postal Box:  "), deladdr-&gt;po);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  Ext:         "),deladdr-&gt;ext);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  Street:      "),deladdr-&gt;street);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  City:        "), deladdr-&gt;city);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  Region:      "), deladdr-&gt;region);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  Postal Code: "), deladdr-&gt;code);</div><div class='del'>-				add_strProp_to_string (string, _ ("\n  Country:     "), deladdr-&gt;country);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_string_append_c (string, '\n');</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;dellabel.l) {</div><div class='del'>-		GList *node;</div><div class='del'>-		</div><div class='del'>-		for (node = crd-&gt;dellabel.l; node; node = node-&gt;next) {</div><div class='del'>-			CardDelLabel *dellabel = (CardDelLabel *) node-&gt;data;</div><div class='del'>-			</div><div class='del'>-			add_strProp_to_string (string, _ ("\nDelivery Label: "),</div><div class='del'>-					    dellabel-&gt;data);</div><div class='del'>-			add_strAddrType (string, dellabel-&gt;type);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;phone.l) {</div><div class='del'>-		GList *node;</div><div class='del'>-		char *sep;</div><div class='del'>-		</div><div class='del'>-		if (crd-&gt;phone.l-&gt;next) {</div><div class='del'>-			sep = "  ";</div><div class='del'>-			g_string_append (string, _ ("\nTelephones:\n"));</div><div class='del'>-		} else {</div><div class='del'>-			sep = " ";</div><div class='del'>-			g_string_append (string, _ ("\nTelephone:"));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		for (node = crd-&gt;phone.l; node; node = node-&gt;next) {</div><div class='del'>-			CardPhone *phone = (CardPhone *) node-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (phone-&gt;prop.used) {</div><div class='del'>-				g_string_append (string, sep);</div><div class='del'>-				g_string_append (string, phone-&gt;data);</div><div class='del'>-				add_strPhoneType (string, phone-&gt;type);</div><div class='del'>-				g_string_append_c (string, '\n');</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (crd-&gt;phone.l-&gt;next)</div><div class='del'>-		  g_string_append_c (string, '\n');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (crd-&gt;email.l) {</div><div class='del'>-		GList *node;</div><div class='del'>-		char *sep;</div><div class='del'>-		</div><div class='del'>-		if (crd-&gt;email.l-&gt;next) {</div><div class='del'>-			sep = "  ";</div><div class='del'>-			g_string_append (string, _ ("\nE-mail:\n"));</div><div class='del'>-		} else {</div><div class='del'>-			sep = " ";</div><div class='del'>-			g_string_append (string, _ ("\nE-mail:"));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		</div><div class='del'>-		for (node = crd-&gt;email.l; node; node = node-&gt;next) {</div><div class='del'>-			CardEMail *email = (CardEMail *) node-&gt;data;</div><div class='del'>-			</div><div class='del'>-			if (email-&gt;prop.used) {</div><div class='del'>-				g_string_append (string, sep);</div><div class='del'>-				g_string_append (string, email-&gt;data);</div><div class='del'>-				add_strEMailType (string, email-&gt;type);</div><div class='del'>-				g_string_append_c (string, '\n');</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (crd-&gt;email.l-&gt;next)</div><div class='del'>-		  g_string_append_c (string, '\n');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	add_CardStrProperty_to_string (string, _ ("\nMailer: "), &amp;crd-&gt;mailer);</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;timezn.prop.used) {</div><div class='del'>-		char *str;</div><div class='del'>-		</div><div class='del'>-		str = card_timezn_str (crd-&gt;timezn);</div><div class='del'>-		add_strProp_to_string (string, _ ("\nTime Zone: "), str);</div><div class='del'>-		free (str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;geopos.prop.used) {</div><div class='del'>-		char *str;</div><div class='del'>-		</div><div class='del'>-		str = card_geopos_str (crd-&gt;geopos);</div><div class='del'>-		add_strProp_to_string (string, _ ("\nGeo Location: "), str);</div><div class='del'>-		free (str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-        add_CardStrProperty_to_string (string, _ ("\nBusiness Role: "), &amp;crd-&gt;role);</div><div class='del'>-	</div><div class='del'>-/*	if (crd-&gt;logo.prop.used) {</div><div class='del'>-		addPropSizedValue (string, _ ("\nLogo: "), </div><div class='del'>-					  crd-&gt;logo.data, crd-&gt;logo.size);</div><div class='del'>-		add_PhotoType (string, crd-&gt;logo.type);</div><div class='del'>-	}*/</div><div class='del'>-	</div><div class='del'>-/*	if (crd-&gt;agent)</div><div class='del'>-	  addstringectProp (string, card_convert_to_stringect (crd-&gt;agent));*/</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;org.prop.used) {</div><div class='del'>-		addProp_to_string (string, _ ("\nOrg: "));</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Name:  "), crd-&gt;org.name);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Unit:  "), crd-&gt;org.unit1);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Unit2: "), crd-&gt;org.unit2);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Unit3: "), crd-&gt;org.unit3);</div><div class='del'>-		add_strProp_to_string (string, _ ("\n  Unit4: "), crd-&gt;org.unit4);</div><div class='del'>-		g_string_append_c (string, '\n');</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-        add_CardStrProperty_to_string (string, _ ("\nCategories: "), &amp;crd-&gt;categories);</div><div class='del'>-        add_CardStrProperty_to_string (string, _ ("\nComment: "), &amp;crd-&gt;comment);</div><div class='del'>-	</div><div class='del'>-/*	if (crd-&gt;sound.prop.used) {</div><div class='del'>-		if (crd-&gt;sound.type != SOUND_PHONETIC)</div><div class='del'>-		  addPropSizedValue (string, _ ("\nPronunciation: "),</div><div class='del'>-					    crd-&gt;sound.data, crd-&gt;sound.size);</div><div class='del'>-		else</div><div class='del'>-		  add_strProp_to_string (string, _ ("\nPronunciation: "), </div><div class='del'>-				       crd-&gt;sound.data);</div><div class='del'>-		</div><div class='del'>-		add_SoundType (string, crd-&gt;sound.type);</div><div class='del'>-	}*/</div><div class='del'>-	</div><div class='del'>-        add_CardStrProperty_to_string (string, _ ("\nUnique String: "), &amp;crd-&gt;uid);</div><div class='del'>-	</div><div class='del'>-	if (crd-&gt;key.prop.used) {</div><div class='del'>-		add_strProp_to_string (string, _ ("\nPublic Key: "), crd-&gt;key.data);</div><div class='del'>-		add_strKeyType (string, crd-&gt;key.type);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = g_strdup (string-&gt;str);</div><div class='del'>-	g_string_free (string, TRUE);</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'>-card_to_vobj_string (Card *crd)</div><div class='del'>-{</div><div class='del'>-	VObject *object;</div><div class='del'>-	char *data, *ret_val;</div><div class='del'>-	</div><div class='del'>-	g_assert (crd != NULL);</div><div class='del'>-</div><div class='del'>-	object = card_convert_to_vobject (crd);</div><div class='del'>-	data = writeMemVObject (0, 0, object);</div><div class='del'>-        ret_val = g_strdup (data);</div><div class='del'>-	free (data);</div><div class='del'>-		</div><div class='del'>-	cleanVObject (object);</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'>-card_save (Card *crd, FILE *fp)</div><div class='del'>-{</div><div class='del'>-	VObject *object;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (crd != NULL);</div><div class='del'>-</div><div class='del'>-	object = card_convert_to_vobject (crd);</div><div class='del'>-	writeVObject (fp, object);</div><div class='del'>-	cleanVObject (object);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static ECardDate</div><div class='del'>-e_card_date_from_string (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)</div><div class='del'>-{</div><div class='del'>-	char *ret_val;</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'>-		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, &amp;ret_val);</div><div class='del'>-			return ret_val;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ret_val = g_new(char, 1);</div><div class='del'>-	*ret_val = 0;</div><div class='del'>-	return ret_val;</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'>-	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'>-	};</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'>-	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'>-	};</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 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'>-	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'>-	};</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'>-	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'>-	};</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='head'>diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h<br/>deleted file mode 100644<br/>index 3def0654cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/e-card.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'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *   Arturo Espinosa</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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/gtk.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;addressbook/backend/ebook/e-card-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 _ECard {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	char *id;</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'>-	ECardList       *address;  	/* Delivery addresses (ECardDeliveryAddress *) */</div><div class='del'>-	ECardList       *address_label; /* Delivery address labels</div><div class='del'>-					 * (ECardAddrLabel *)               */</div><div class='del'>-</div><div class='del'>-	ECardList       *phone;         /* Phone numbers (ECardPhone *)     */</div><div class='del'>-	ECardList       *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            *fburl;         /* Free Busy URL                    */</div><div class='del'>-</div><div class='del'>-	ECardList       *categories;    /* Categories.                      */</div><div class='del'>-</div><div class='del'>-	ECardList       *arbitrary;     /* Arbitrary fields.                */</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'>-</div><div class='del'>-	char            *categories;    /* A list of the categories to which</div><div class='del'>-					   this card belongs.               */</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'>-	ECardList        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'>-ECard         *e_card_new       (      char  *vcard);</div><div class='del'>-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'>-char          *e_card_get_vcard (      ECard *card);</div><div class='del'>-ECard         *e_card_duplicate (      ECard *card);</div><div class='del'>-</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'>-void        e_card_phone_free (      ECardPhone *phone);</div><div class='del'>-</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'>-void                  e_card_delivery_address_free        (      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_string (const char                 *full_addr);</div><div class='del'>-</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'>-void            e_card_address_label_free (      ECardAddrLabel *addr);</div><div class='del'>-</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'>-void       e_card_name_free        (      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'>-ECardArbitrary *e_card_arbitrary_new  (void);</div><div class='del'>-ECardArbitrary *e_card_arbitrary_copy (const ECardArbitrary *arbitrary);</div><div class='del'>-void            e_card_arbitrary_free (      ECardArbitrary *arbitrary);</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/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c<br/>deleted file mode 100644<br/>index 8837a11a9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/load-pine-addressbook.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/load-pine-addressbook.c</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'>-#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;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-book.h&gt;</div><div class='del'>-</div><div class='del'>-static CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</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("blah", "0.0", *argc, argv, NULL, 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'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</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_CORBA_init_with_popt_table (</div><div class='del'>-		"blah", "0.0",</div><div class='del'>-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &amp;ev);</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'>-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(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'>-	FILE *fp = fopen (".addressbook", "r");</div><div class='del'>-	char line[1024];</div><div class='del'>-	while(fgets(line, 1024, fp)) {</div><div class='del'>-		int length = strlen(line);</div><div class='del'>-		char **strings;</div><div class='del'>-		ECardName *name;</div><div class='del'>-		ECard *card;</div><div class='del'>-		ECardList *list;</div><div class='del'>-		if (line[length - 1] == '\n')</div><div class='del'>-			line[--length] = 0;</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'>-		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_card_list_append(list, strings[2]);</div><div class='del'>-		g_strfreev(strings);</div><div class='del'>-		e_book_add_card(book, card, add_card_cb, card);</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'>-	</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'>-#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'>-	init_corba (&amp;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 c6ee6e9ff1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-card.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/test-card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,194 +0,0 @@</div><div class='del'>-#include &lt;gnome.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:Helix Code, 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@helixcode.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'>-	ECardList *address;</div><div class='del'>-	ECardList *phone;</div><div class='del'>-	ECardList *email;</div><div class='del'>-	ECardIterator *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 (cardstr);</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'>-		       "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 ( 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_card_list_get_iterator(address);</div><div class='del'>-	  for (; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-	    printf("Email : %s\n", (char *) e_card_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_card_list_get_iterator(address);</div><div class='del'>-	  for (; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-	    ECardPhone *e_card_phone = (ECardPhone *) e_card_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_card_list_get_iterator(address);</div><div class='del'>-	  for (; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) {</div><div class='del'>-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_card_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(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 e492323310..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-client-list.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/test-client-list.c</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'>-#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'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#endif</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'>-#ifdef USING_OAF</div><div class='del'>-	gnome_init ("blah", "0.0", argc, argv);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-#else</div><div class='del'>-	gnome_CORBA_init_with_popt_table (</div><div class='del'>-		"blah", "0.0",</div><div class='del'>-		&amp;argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &amp;ev);</div><div class='del'>-#endif</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(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 ef13c1ab96..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-client.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/ebook/test-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +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;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-book.h&gt;</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@helixcode.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'>-#ifdef USING_OAF</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</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("blah", "0.0", *argc, argv, NULL, 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'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</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_CORBA_init_with_popt_table (</div><div class='del'>-		"blah", "0.0",</div><div class='del'>-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &amp;ev);</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'>-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(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'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	char *vcard;</div><div class='del'>-	ECard *card;</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'>-	card = e_book_get_card (book, id);</div><div class='del'>-	g_timer_stop (timer);</div><div class='del'>-</div><div class='del'>-	vcard = e_card_get_vcard(card);</div><div class='del'>-	printf ("%g\n", g_timer_elapsed (timer, NULL));</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'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</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'>-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'>-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'>-	init_corba (&amp;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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 b8cf15c4ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/idl/addressbook.idl?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/idl/addressbook.idl</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 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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 Evolution {</div><div class='del'>-</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'>-</div><div class='del'>-	interface CardCursor : Bonobo::Unknown {</div><div class='del'>-		long   get_length ();</div><div class='del'>-		string get_nth    (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 signal_card_added (in VCardList cards);</div><div class='del'>-		void signal_card_removed (in CardId id);</div><div class='del'>-		void signal_card_changed (in VCardList cards);</div><div class='del'>-		void signal_sequence_complete ();</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'>-		VCard get_vcard (in CardId id);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Permissions.  the first form is general write</div><div class='del'>-		 * permission (whether or not the user can add or</div><div class='del'>-		 * remove or modify any entry in the addressbook.)</div><div class='del'>-		 *</div><div class='del'>-		 * if can_write returns TRUE, can_write_card can still</div><div class='del'>-		 * return FALSE if the user doesn't have permission to</div><div class='del'>-		 * modify/remove that specific card.</div><div class='del'>-		 */</div><div class='del'>-		boolean can_write ();</div><div class='del'>-		boolean can_write_card (in CardId Id);</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 create_card (in VCard vcard);</div><div class='del'>-		void remove_card (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 modify_card (in VCard vcard);</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 * These two functions return 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.  The syntax for the query</div><div class='del'>-		 * string is not yet defined.</div><div class='del'>-		 */</div><div class='del'>-		void get_cursor (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 get_book_view(in BookViewListener listener, in string query);</div><div class='del'>-</div><div class='del'>-		void check_connection ();</div><div class='del'>-</div><div class='del'>-		string get_name ();</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'>-			ProtocolNotSupported,</div><div class='del'>-			OtherError</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		void respond_create_card (in CallStatus status, in CardId Id);</div><div class='del'>-</div><div class='del'>-		void respond_remove_card (in CallStatus status);</div><div class='del'>-</div><div class='del'>-		void respond_modify_card (in CallStatus status);</div><div class='del'>-		</div><div class='del'>-		void report_open_book_progress (in string status_message, in short percent);</div><div class='del'>-</div><div class='del'>-		void respond_open_book (in CallStatus status, in Book book);</div><div class='del'>-</div><div class='del'>-		void respond_get_cursor (in CallStatus status, in CardCursor cursor);</div><div class='del'>-</div><div class='del'>-		void respond_get_view (in CallStatus status, in BookView view);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * report_connection_status:</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 report_connection_status (in boolean connected);</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 open_book (in string uri, in BookListener listener)</div><div class='del'>-			raises (ProtocolNotSupported);</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 69fdeb41a7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +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) $(srcdir)/../idl/addressbook.idl $(idl_flags)</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \</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'>-        $(BONOBO_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-if ENABLE_LDAP</div><div class='del'>-LDAP_BACKEND = pas-backend-ldap.c pas-backend-ldap.h</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-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='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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c<br/>deleted file mode 100644<br/>index f76a92c38c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-file.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-backend-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1244 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"  </div><div class='del'>-#include &lt;gtk/gtksignal.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'>-#ifdef HAVE_DB_185_H</div><div class='del'>-#include &lt;db_185.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'>-#include "pas-backend-file.h"</div><div class='del'>-#include "pas-book.h"</div><div class='del'>-#include "pas-card-cursor.h"</div><div class='del'>-#include &lt;ebook/e-card.h&gt;</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</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.1"</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'>-</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'>-	DB       *file_db;</div><div class='del'>-	GList    *book_views;</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'>-	ESExp                       *search_sexp;</div><div class='del'>-	PASBackendFileSearchContext *search_context;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASBackendFileSearchContext {</div><div class='del'>-	ECard *ecard;</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'>-	Evolution_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'>-	Evolution_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'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Book    corba_book;</div><div class='del'>-	PASBook           *book = (PASBook *)data;</div><div class='del'>-	PASBackendFile    *bf;</div><div class='del'>-	GList             *list;</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE(pas_book_get_backend(book));</div><div class='del'>-	for (list = bf-&gt;priv-&gt;book_views; list; list = g_list_next(list)) {</div><div class='del'>-		PASBackendFileBookView *view = list-&gt;data;</div><div class='del'>-		if (view-&gt;book_view == PAS_BOOK_VIEW(object)) {</div><div class='del'>-			gtk_object_unref((GtkObject *)view-&gt;search_sexp);</div><div class='del'>-			g_free (view-&gt;search_context);</div><div class='del'>-			g_free (view-&gt;search);</div><div class='del'>-			g_free (view);</div><div class='del'>-			bf-&gt;priv-&gt;book_views = g_list_remove_link(bf-&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'>-	Evolution_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'>-string_to_dbt(const char *str, DBT *dbt)</div><div class='del'>-{</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-%08lX%08X", time(NULL), c++);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_email (ECard *ecard, const char *str,</div><div class='del'>-	       char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	ECardList *prop_list;</div><div class='del'>-	ECardIterator *iter;</div><div class='del'>-	gboolean truth = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(ecard),</div><div class='del'>-		       "email", &amp;prop_list, NULL);</div><div class='del'>-</div><div class='del'>-	iter = e_card_list_get_iterator(prop_list);</div><div class='del'>-</div><div class='del'>-	while (e_card_iterator_is_valid(iter)) {</div><div class='del'>-		</div><div class='del'>-		if (compare((char*)e_card_iterator_get(iter), str)) {</div><div class='del'>-			truth = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			e_card_iterator_next(iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(iter));</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'>-compare_phone (ECard *ecard, const char *str,</div><div class='del'>-	       char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	ECardList *prop_list;</div><div class='del'>-	ECardIterator *iter;</div><div class='del'>-	gboolean truth = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(ecard),</div><div class='del'>-		       "phone", &amp;prop_list, NULL);</div><div class='del'>-				</div><div class='del'>-	iter = e_card_list_get_iterator(prop_list);</div><div class='del'>-</div><div class='del'>-	while (e_card_iterator_is_valid(iter)) {</div><div class='del'>-		ECardPhone *phone = (ECardPhone*)e_card_iterator_get(iter);</div><div class='del'>-		if (compare(phone-&gt;number, str)) {</div><div class='del'>-			truth = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			e_card_iterator_next(iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(iter));</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'>-compare_address (ECard *ecard, 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 struct prop_info {</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'>-	int prop_type;</div><div class='del'>-	gboolean (*list_compare)(ECard *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'>-	/* query prop,  ecard prop,   type,              list compare function */</div><div class='del'>-	{ "file_as",    "file_as",    PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "full_name",  "full_name",  PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "url",        "url",        PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "mailer",     "mailer",     PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "org",        "org",        PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "org_unit",   "org_unit",   PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "office",     "office",     PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "title",      "title",      PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "role",       "role",       PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "manager",    "manager",    PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "assistant",  "assistant",  PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "nickname",   "nickname",   PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "spouse",     "spouse",     PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ "email",      "email",      PROP_TYPE_LIST,    compare_email },</div><div class='del'>-	{ "phone",      "phone",      PROP_TYPE_LIST,    compare_phone },</div><div class='del'>-	{ "address",    "address",    PROP_TYPE_LIST,    compare_address },</div><div class='del'>-	{ "note",       "note",       PROP_TYPE_NORMAL,  NULL },</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(PASBackendFileSearchContext *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'>-</div><div class='del'>-		propname = argv[0]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-			if (!strcmp (prop_info_table[i].query_prop, propname)) {</div><div class='del'>-				info = &amp;prop_info_table[i];</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (info) {</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'>-				gtk_object_get(GTK_OBJECT(ctx-&gt;ecard),</div><div class='del'>-					       info-&gt;ecard_prop, &amp;prop, NULL);</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'>-			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;ecard, argv[1]-&gt;value.string, compare);</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(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'>-	PASBackendFileSearchContext *ctx = data;</div><div class='del'>-</div><div class='del'>-	return entry_compare (ctx, f, argc, argv, strstr);</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'>-	PASBackendFileSearchContext *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 = strstr(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'>-	PASBackendFileSearchContext *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 = strstr(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'>-	PASBackendFileSearchContext *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'>-static gboolean</div><div class='del'>-vcard_matches_search (PASBackendFileBookView *view, char *vcard_string)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	view-&gt;search_context-&gt;ecard = e_card_new (vcard_string);</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 (!view-&gt;search_context-&gt;ecard)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_eval(view-&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(view-&gt;search_context-&gt;ecard));</div><div class='del'>-</div><div class='del'>-	e_sexp_result_free(r);</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'>-pas_backend_file_search (PASBackendFile  	*bf,</div><div class='del'>-			 PASBook         	*book,</div><div class='del'>-			 PASBackendFileBookView *view)</div><div class='del'>-{</div><div class='del'>-	int     db_error = 0;</div><div class='del'>-	GList   *cards = NULL;</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 i;</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'>-	view-&gt;search_sexp = e_sexp_new();</div><div class='del'>-	view-&gt;search_context = g_new0(PASBackendFileSearchContext, 1);</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(view-&gt;search_sexp, 0, symbols[i].name,</div><div class='del'>-					     (ESExpIFunc *)symbols[i].func, view-&gt;search_context);</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_add_function(view-&gt;search_sexp, 0, symbols[i].name,</div><div class='del'>-					    symbols[i].func, view-&gt;search_context);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_sexp_input_text(view-&gt;search_sexp, view-&gt;search, strlen(view-&gt;search));</div><div class='del'>-	e_sexp_parse(view-&gt;search_sexp);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;seq(db, &amp;id_dbt, &amp;vcard_dbt, R_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'>-			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 (vcard_matches_search (view, vcard_string)) {</div><div class='del'>-				cards = g_list_append (cards, strdup(vcard_string));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		db_error = db-&gt;seq(db, &amp;id_dbt, &amp;vcard_dbt, R_NEXT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (db_error == -1) {</div><div class='del'>-		g_warning ("pas_backend_file_search: error building list\n");</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		pas_book_view_notify_add (view-&gt;book_view, cards);</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'>-	/*</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 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(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, &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'>-		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'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	char *id;</div><div class='del'>-	char *vcard;</div><div class='del'>-	GList          *list;</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 (list = bf-&gt;priv-&gt;book_views; list; list = g_list_next(list)) {</div><div class='del'>-			PASBackendFileBookView *view = list-&gt;data;</div><div class='del'>-			if (vcard_matches_search (view, vcard)) {</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'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pas_book_respond_create (</div><div class='del'>-				 book,</div><div class='del'>-				 Evolution_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'>-				 Evolution_BookListener_CardNotFound,</div><div class='del'>-				 "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(req-&gt;vcard);</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'>-				      PASRequest *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'>-	GList         *list;</div><div class='del'>-	char          *vcard_string;</div><div class='del'>-</div><div class='del'>-	string_to_dbt (req-&gt;id, &amp;id_dbt);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;get (db, &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'>-				 Evolution_BookListener_CardNotFound);</div><div class='del'>-		g_free (req-&gt;id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	db_error = db-&gt;del (db, &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'>-				 Evolution_BookListener_CardNotFound);</div><div class='del'>-		g_free (req-&gt;id);</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 (list = bf-&gt;priv-&gt;book_views; list; list = g_list_next(list)) {</div><div class='del'>-		PASBackendFileBookView *view = list-&gt;data;</div><div class='del'>-		if (vcard_matches_search (view, vcard_string)) {</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'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	pas_book_respond_remove (</div><div class='del'>-				 book,</div><div class='del'>-				 Evolution_BookListener_Success);</div><div class='del'>-	</div><div class='del'>-	g_free (req-&gt;id);</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'>-				      PASRequest *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'>-	GList         *list;</div><div class='del'>-	ECard         *card;</div><div class='del'>-	char          *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'>-	string_to_dbt (id, &amp;id_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, &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'>-				 Evolution_BookListener_CardNotFound);</div><div class='del'>-		g_free (req-&gt;id);</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, &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 (list = bf-&gt;priv-&gt;book_views; list; list = g_list_next(list)) {</div><div class='del'>-			PASBackendFileBookView *view = list-&gt;data;</div><div class='del'>-			gboolean old_match, new_match;</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'>-			pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pas_book_respond_modify (</div><div class='del'>-				 book,</div><div class='del'>-				 Evolution_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'>-				 Evolution_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'>-	g_free (req-&gt;vcard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_build_all_cards_list(PASBackend *backend,</div><div class='del'>-				      PASBackendFileCursorPrivate *cursor_data)</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'>-	  int            db_error;</div><div class='del'>-	  DBT  id_dbt, vcard_dbt;</div><div class='del'>-  </div><div class='del'>-	  cursor_data-&gt;elements = NULL;</div><div class='del'>-	  </div><div class='del'>-	  db_error = db-&gt;seq(db, &amp;id_dbt, &amp;vcard_dbt, R_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'>-			  cursor_data-&gt;elements = g_list_append(cursor_data-&gt;elements,</div><div class='del'>-								g_strdup(vcard_dbt.data));</div><div class='del'>-</div><div class='del'>-		  }</div><div class='del'>-</div><div class='del'>-		  db_error = db-&gt;seq(db, &amp;id_dbt, &amp;vcard_dbt, R_NEXT);</div><div class='del'>-</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	  if (db_error == -1) {</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'>-	  }</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'>-				     PASRequest *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'>-	Evolution_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_all_cards_list(backend, cursor_data);</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'>-	Evolution_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'>-		 ? Evolution_BookListener_Success </div><div class='del'>-		 : Evolution_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'>-					PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	PASBookView       *book_view;</div><div class='del'>-	Evolution_Book    corba_book;</div><div class='del'>-	PASBackendFileBookView *view;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (req-&gt;listener != NULL);</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'>-	Evolution_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_book_view: 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'>-	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_book_view (book,</div><div class='del'>-		   (book_view != NULL</div><div class='del'>-		    ? Evolution_BookListener_Success </div><div class='del'>-		    : Evolution_BookListener_CardNotFound /* XXX */),</div><div class='del'>-		   book_view);</div><div class='del'>-</div><div class='del'>-	view = g_new(PASBackendFileBookView, 1);</div><div class='del'>-	view-&gt;book_view = book_view;</div><div class='del'>-	view-&gt;search = g_strdup(req-&gt;search);</div><div class='del'>-</div><div class='del'>-	bf-&gt;priv-&gt;book_views = g_list_prepend(bf-&gt;priv-&gt;book_views, view);</div><div class='del'>-</div><div class='del'>-	pas_backend_file_search (bf, book, view);</div><div class='del'>-</div><div class='del'>-	g_free(req-&gt;search);</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'>-					   PASRequest *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 gboolean</div><div class='del'>-can_write (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	char *path = pas_backend_file_extract_path_from_uri (bf-&gt;priv-&gt;uri);</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	retval = (access (path, W_OK) != -1);</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_can_write (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	PASBackend* backend = pas_book_get_backend (book);</div><div class='del'>-</div><div class='del'>-	return can_write(backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_can_write_card (PASBook *book,</div><div class='del'>-				 const char *id)</div><div class='del'>-{</div><div class='del'>-	PASBackend* backend = pas_book_get_backend (book);</div><div class='del'>-</div><div class='del'>-	return can_write(backend);</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, 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, 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, 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, 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, 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, req);</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_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'>-static char *</div><div class='del'>-pas_backend_file_get_vcard (PASBook *book, const char *id)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-	DBT            id_dbt, vcard_dbt;</div><div class='del'>-	DB             *db;</div><div class='del'>-	int            db_error;</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 (id, &amp;id_dbt);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;get (db, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-	if (db_error == 0) {</div><div class='del'>-		/* success */</div><div class='del'>-		return g_strdup (vcard_dbt.data);</div><div class='del'>-	}</div><div class='del'>-	else if (db_error == 1) {</div><div class='del'>-		/* key was not in file */</div><div class='del'>-		return g_strdup (""); /* XXX */</div><div class='del'>-	}</div><div class='del'>-	else /* if (db_error &lt; 0)*/ {</div><div class='del'>-		/* error */</div><div class='del'>-		return g_strdup (""); /* XXX */</div><div class='del'>-	}</div><div class='del'>-}</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'>-	if (!strcmp (old_version, "0.0")) {</div><div class='del'>-		/* 0.0 is the same as 0.1, we just need to add the version */</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'>-</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, &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'>-	else {</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'>-</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'>-</div><div class='del'>-	db_error = db-&gt;get (db, &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'>-#define INITIAL_VCARD "BEGIN:VCARD\n\</div><div class='del'>-X-EVOLUTION-FILE-AS:Helix Code, Inc.\n\</div><div class='del'>-LABEL;WORK;QUOTED-PRINTABLE:101 Rogers St. Ste. 214=0ACambridge, MA 02142=0AUSA\n\</div><div class='del'>-TEL;WORK;VOICE:(617) 679-1984\n\</div><div class='del'>-TEL;WORK;FAX:(617) 679-1949\n\</div><div class='del'>-EMAIL;INTERNET:hello@helixcode.com\n\</div><div class='del'>-URL:http://www.helixcode.com/\n\</div><div class='del'>-ORG:Helix Code, Inc.;\n\</div><div class='del'>-NOTE:Welcome to the Helix Code Addressbook.\n\</div><div class='del'>-END:VCARD"</div><div class='del'>-</div><div class='del'>-static gboolean</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'>-</div><div class='del'>-	g_assert (bf-&gt;priv-&gt;loaded == FALSE);</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'>-	bf-&gt;priv-&gt;file_db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL);</div><div class='del'>-	if (bf-&gt;priv-&gt;file_db == NULL) {</div><div class='del'>-		bf-&gt;priv-&gt;file_db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);</div><div class='del'>-</div><div class='del'>-		if (bf-&gt;priv-&gt;file_db) {</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'>-</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	if (bf-&gt;priv-&gt;file_db != NULL) {</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'>-		/* XXX what if we fail to upgrade it? */</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'>-	} 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'>-/* 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'>-			     Evolution_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 (</div><div class='del'>-		backend, listener,</div><div class='del'>-		pas_backend_file_get_vcard,</div><div class='del'>-		pas_backend_file_can_write,</div><div class='del'>-		pas_backend_file_can_write_card);</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, Evolution_BookListener_Success);</div><div class='del'>-	} else {</div><div class='del'>-		/* Open the book. */</div><div class='del'>-		pas_book_respond_open (</div><div class='del'>-			book, Evolution_BookListener_Success);</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_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 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'>-	g_free (bf-&gt;priv-&gt;uri);</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'>-</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 = NULL;</div><div class='del'>-	priv-&gt;uri        = NULL;</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 4da9a29cc5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-file.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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, Helix Code, 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 02719657c3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-ldap.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-backend-ldap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1097 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"  </div><div class='del'>-#include &lt;gtk/gtksignal.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;lber.h&gt;</div><div class='del'>-#include &lt;ldap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pas-backend-ldap.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;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'>-#define LDAP_MAX_SEARCH_RESPONSES 500</div><div class='del'>-</div><div class='del'>-static gchar *map_e_card_prop_to_ldap(gchar *e_card_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'>-</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'>-	LDAP     *ldap;</div><div class='del'>-	gchar    *ldap_host;</div><div class='del'>-	gchar    *ldap_rootdn;</div><div class='del'>-	int      ldap_port;</div><div class='del'>-	GList    *book_views;</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'>-	int                   search_idle;</div><div class='del'>-	int                   search_msgid;</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'>-	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'>-	return g_strdup("");</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'>-	Evolution_Book corba_book;</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) 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'>-	Evolution_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'>-	/* free the ldap specific cursor information */</div><div class='del'>-</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'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_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'>-			g_free (view-&gt;search);</div><div class='del'>-			g_free (view);</div><div class='del'>-			if (view-&gt;search_idle != 0)</div><div class='del'>-				g_source_remove(view-&gt;search_idle);</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'>-	Evolution_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'>-pas_backend_ldap_ensure_connected (PASBackendLDAP *bl)</div><div class='del'>-{</div><div class='del'>-	LDAP           *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	/* the connection has gone down, or wasn't ever opened */</div><div class='del'>-	if (ldap == NULL ||</div><div class='del'>-	    (ldap_simple_bind_s(ldap, NULL /*binddn*/, NULL /*passwd*/) != LDAP_SUCCESS)) {</div><div class='del'>-</div><div class='del'>-		/* close connection first if it's open first */</div><div class='del'>-		if (ldap)</div><div class='del'>-			ldap_unbind (ldap);</div><div class='del'>-</div><div class='del'>-		bl-&gt;priv-&gt;ldap = ldap_open (bl-&gt;priv-&gt;ldap_host, bl-&gt;priv-&gt;ldap_port);</div><div class='del'>-		if (NULL != bl-&gt;priv-&gt;ldap) {</div><div class='del'>-			ldap_simple_bind_s(bl-&gt;priv-&gt;ldap,</div><div class='del'>-					   NULL /*binddn*/, NULL /*passwd*/);</div><div class='del'>-			bl-&gt;priv-&gt;connected = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			g_warning ("pas_backend_ldap_ensure_connected failed for "</div><div class='del'>-				   "'ldap://%s:%d/%s' (error %s)\n",</div><div class='del'>-				   bl-&gt;priv-&gt;ldap_host,</div><div class='del'>-				   bl-&gt;priv-&gt;ldap_port,</div><div class='del'>-				   bl-&gt;priv-&gt;ldap_rootdn ? bl-&gt;priv-&gt;ldap_rootdn : "",</div><div class='del'>-				   </div><div class='del'>-				   ldap_err2string(ldap-&gt;ld_errno));</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_create_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	g_warning ("pas_backend_ldap_process_create_card not implemented\n");</div><div class='del'>-</div><div class='del'>-	pas_book_respond_create (</div><div class='del'>-				 book,</div><div class='del'>-				 Evolution_BookListener_CardNotFound,</div><div class='del'>-				 "");</div><div class='del'>-</div><div class='del'>-	g_free (req-&gt;vcard);</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'>-	g_warning ("pas_backend_ldap_process_remove_card not implemented\n");</div><div class='del'>-</div><div class='del'>-	pas_book_respond_remove (</div><div class='del'>-				 book,</div><div class='del'>-				 Evolution_BookListener_CardNotFound);</div><div class='del'>-</div><div class='del'>-	g_free (req-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_build_all_cards_list(PASBackend *backend,</div><div class='del'>-				      PASBackendLDAPCursorPrivate *cursor_data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	LDAP           *ldap;</div><div class='del'>-	int            ldap_error;</div><div class='del'>-	LDAPMessage    *res, *e;</div><div class='del'>-</div><div class='del'>-	pas_backend_ldap_ensure_connected(bl);</div><div class='del'>-</div><div class='del'>-	ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	if (ldap) {</div><div class='del'>-		ldap-&gt;ld_sizelimit = LDAP_MAX_SEARCH_RESPONSES;</div><div class='del'>-		ldap-&gt;ld_deref = LDAP_DEREF_ALWAYS;</div><div class='del'>-</div><div class='del'>-		if ((ldap_error = ldap_search_s (ldap,</div><div class='del'>-						 bl-&gt;priv-&gt;ldap_rootdn,</div><div class='del'>-						 LDAP_SCOPE_ONELEVEL,</div><div class='del'>-						 "(objectclass=*)",</div><div class='del'>-						 NULL, 0, &amp;res)) == -1) {</div><div class='del'>-			g_warning ("ldap error '%s' in "</div><div class='del'>-				   "pas_backend_ldap_build_all_cards_list\n",</div><div class='del'>-				   ldap_err2string(ldap_error));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cursor_data-&gt;elements = NULL;</div><div class='del'>-</div><div class='del'>-		cursor_data-&gt;num_elements = ldap_count_entries (ldap, res);</div><div class='del'>-</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'>-</div><div class='del'>-			/* for now just make a list of the dn's */</div><div class='del'>-#if 0</div><div class='del'>-			for ( a = ldap_first_attribute( ldap, e, &amp;ber ); a != NULL;</div><div class='del'>-			      a = ldap_next_attribute( ldap, e, ber ) ) {</div><div class='del'>-			}</div><div class='del'>-#else</div><div class='del'>-			cursor_data-&gt;elements = g_list_prepend(cursor_data-&gt;elements,</div><div class='del'>-						       g_strdup(ldap_get_dn(ldap, e)));</div><div class='del'>-#endif</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'>-		ldap_msgfree(res);</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_modify_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	g_warning ("pas_backend_ldap_process_modify_card not implemented\n");</div><div class='del'>-</div><div class='del'>-	pas_book_respond_modify (</div><div class='del'>-				 book,</div><div class='del'>-				 Evolution_BookListener_CardNotFound);</div><div class='del'>-	g_free (req-&gt;vcard);</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'>-	CORBA_Environment ev;</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data;</div><div class='del'>-	int            ldap_error = 0;</div><div class='del'>-	PASCardCursor *cursor;</div><div class='del'>-	Evolution_Book corba_book;</div><div class='del'>-</div><div class='del'>-	cursor_data = g_new(PASBackendLDAPCursorPrivate, 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_ldap_build_all_cards_list(backend, cursor_data);</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'>-	Evolution_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'>-		(ldap_error == 0 </div><div class='del'>-		 ? Evolution_BookListener_Success </div><div class='del'>-		 : Evolution_BookListener_CardNotFound),</div><div class='del'>-		cursor);</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'>-	GList **list = 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_new(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'>-		strings[argc+3 - 1] = NULL;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; argc; i ++) {</div><div class='del'>-			GList *list_head = *list;</div><div class='del'>-			strings[argc - i] = (*list)-&gt;data;</div><div class='del'>-			*list = g_list_remove_link(*list, *list);</div><div class='del'>-			g_list_free_1(list_head);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*list = g_list_prepend(*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(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'>-	GList **list = 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_new(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'>-		strings[argc+3 - 1] = NULL;</div><div class='del'>-		for (i = 0; i &lt; argc; i ++) {</div><div class='del'>-			GList *list_head = *list;</div><div class='del'>-			strings[argc - i] = (*list)-&gt;data;</div><div class='del'>-			*list = g_list_remove_link(*list, *list);</div><div class='del'>-			g_list_free_1(list_head);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*list = g_list_prepend(*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(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'>-	GList **list = 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 = (*list)-&gt;data;</div><div class='del'>-		(*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(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'>-	GList **list = 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 = argv[1]-&gt;value.string;</div><div class='del'>-		char *ldap_attr = map_e_card_prop_to_ldap(propname);</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 (ldap_attr)</div><div class='del'>-			*list = g_list_prepend(*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'>-	r = e_sexp_result_new(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'>-	GList **list = 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 = argv[1]-&gt;value.string;</div><div class='del'>-		char *ldap_attr = map_e_card_prop_to_ldap(propname);</div><div class='del'>-</div><div class='del'>-		if (ldap_attr)</div><div class='del'>-			*list = g_list_prepend(*list,</div><div class='del'>-					       g_strdup_printf("(%s=%s)",</div><div class='del'>-							       ldap_attr, str));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(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'>-	GList **list = 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 = argv[1]-&gt;value.string;</div><div class='del'>-		char *ldap_attr = map_e_card_prop_to_ldap(propname);</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 (ldap_attr)</div><div class='del'>-			*list = g_list_prepend(*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'>-	r = e_sexp_result_new(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'>-	GList **list = 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 = argv[1]-&gt;value.string;</div><div class='del'>-		char *ldap_attr = map_e_card_prop_to_ldap(propname);</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 (ldap_attr)</div><div class='del'>-			*list = g_list_prepend(*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'>-	r = e_sexp_result_new(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 (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'>-	GList *list = NULL;</div><div class='del'>-	int i;</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;list);</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;list);</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'>-	gtk_object_unref(GTK_OBJECT(sexp));</div><div class='del'>-	e_sexp_result_free(r);</div><div class='del'>-</div><div class='del'>-	if (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 (list, (GFunc)g_free, NULL);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		retval = list-&gt;data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct_email_list(ECardSimple *card, const char *prop, 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 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_NORMAL   0x01</div><div class='del'>-#define PROP_TYPE_LIST     0x02</div><div class='del'>-#define PROP_TYPE_LISTITEM 0x03</div><div class='del'>-	int prop_type;</div><div class='del'>-	void (*construct_list_func)(ECardSimple *card, const char *prop, char **values);</div><div class='del'>-} prop_info_table[] = {</div><div class='del'>-	/* field_id,                     query prop,   ldap attr,         type,           list construct function */</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name",  "cn",              PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_TITLE,     "title",      "title",           PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,  "org",        "o",               PROP_TYPE_NORMAL,  NULL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, "phone",  "telephonenumber", PROP_TYPE_NORMAL,    NULL },</div><div class='del'>-	{ 0 /* unused */,                "email",      "mail",            PROP_TYPE_LIST,    construct_email_list },</div><div class='del'>-};</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 gchar *</div><div class='del'>-map_e_card_prop_to_ldap(gchar *e_card_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 (e_card_prop, prop_info_table[i].query_prop))</div><div class='del'>-			return prop_info_table[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'>-static gboolean</div><div class='del'>-poll_ldap (PASBackendLDAPBookView *view)</div><div class='del'>-{</div><div class='del'>-	LDAP           *ldap;</div><div class='del'>-	int            rc;</div><div class='del'>-	LDAPMessage    *res, *e;</div><div class='del'>-	GList   *cards = NULL;</div><div class='del'>-</div><div class='del'>-	printf ("polling ldap server\n");</div><div class='del'>-</div><div class='del'>-	ldap = view-&gt;blpriv-&gt;ldap;</div><div class='del'>-		</div><div class='del'>-	if ((rc = ldap_result (ldap, view-&gt;search_msgid, 0, NULL, &amp;res))</div><div class='del'>-	    != LDAP_RES_SEARCH_ENTRY) {</div><div class='del'>-		view-&gt;search_idle = 0;</div><div class='del'>-		pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-		</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'>-		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 = ldap_get_dn(ldap, e);</div><div class='del'>-		char *attr;</div><div class='del'>-		BerElement *ber = NULL;</div><div class='del'>-</div><div class='del'>-		e_card_simple_set_id (card, 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'>-</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos; i ++)</div><div class='del'>-				if (!strcmp (attr, prop_info_table[i].ldap_attr))</div><div class='del'>-					info = &amp;prop_info_table[i];</div><div class='del'>-</div><div class='del'>-			if (info) {</div><div class='del'>-				char **values;</div><div class='del'>-				values = ldap_get_values (ldap, e, attr);</div><div class='del'>-</div><div class='del'>-				if (info-&gt;prop_type == PROP_TYPE_NORMAL) {</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 == PROP_TYPE_LIST) {</div><div class='del'>-					/* if it's a list call the construction function,</div><div class='del'>-					   which calls gtk_object_set to set the property */</div><div class='del'>-					info-&gt;construct_list_func(card,</div><div class='del'>-								  info-&gt;query_prop,</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'>-		/* if ldap-&gt;ld_errno == LDAP_DECODING_ERROR there was an</div><div class='del'>-		   error decoding an attribute, and we shouldn't free ber,</div><div class='del'>-		   since the ldap library already did it. */</div><div class='del'>-		if (ldap-&gt;ld_errno != LDAP_DECODING_ERROR &amp;&amp; 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'>-		cards = g_list_append (cards, e_card_simple_get_vcard (card));</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'>-	if (cards) {</div><div class='del'>-		pas_book_view_notify_add (view-&gt;book_view, cards);</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'>-		cards = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ldap_msgfree(res);</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_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 = pas_backend_ldap_build_query(view-&gt;search);</div><div class='del'>-</div><div class='del'>-	if (ldap_query != NULL) {</div><div class='del'>-		LDAP           *ldap;</div><div class='del'>-</div><div class='del'>-		pas_backend_ldap_ensure_connected(bl);</div><div class='del'>-</div><div class='del'>-		ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-		if (ldap) {</div><div class='del'>-			ldap-&gt;ld_sizelimit = LDAP_MAX_SEARCH_RESPONSES;</div><div class='del'>-			ldap-&gt;ld_deref = LDAP_DEREF_ALWAYS;</div><div class='del'>-</div><div class='del'>-			if ((view-&gt;search_msgid = ldap_search (ldap,</div><div class='del'>-							       bl-&gt;priv-&gt;ldap_rootdn,</div><div class='del'>-							       LDAP_SCOPE_ONELEVEL,</div><div class='del'>-							       ldap_query,</div><div class='del'>-							       NULL, 0)) == -1) {</div><div class='del'>-				g_warning ("ldap error '%s' in pas_backend_ldap_search\n", ldap_err2string(ldap-&gt;ld_errno));</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				view-&gt;search_idle = g_idle_add((GSourceFunc)poll_ldap, 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'>-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'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Book    corba_book;</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;listener != NULL);</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'>-	Evolution_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_book_view: 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'>-	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_book_view (book,</div><div class='del'>-		(book_view != NULL</div><div class='del'>-		 ? Evolution_BookListener_Success </div><div class='del'>-		 : Evolution_BookListener_CardNotFound /* XXX */),</div><div class='del'>-		book_view);</div><div class='del'>-</div><div class='del'>-	view = g_new(PASBackendLDAPBookView, 1);</div><div class='del'>-	view-&gt;book_view = book_view;</div><div class='del'>-	view-&gt;search = g_strdup(req-&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_backend_ldap_search (bl, book, view);</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_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 gboolean</div><div class='del'>-pas_backend_ldap_can_write (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	return FALSE; /* XXX */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_ldap_can_write_card (PASBook *book,</div><div class='del'>-				 const char *id)</div><div class='del'>-{</div><div class='del'>-	return FALSE; /* XXX */</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 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'>-</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_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 char *</div><div class='del'>-pas_backend_ldap_get_vcard (PASBook *book, const char *id)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-	LDAP           *ldap;</div><div class='del'>-	int            ldap_error = LDAP_SUCCESS; /* XXX */</div><div class='del'>-</div><div class='del'>-	bl = PAS_BACKEND_LDAP (pas_book_get_backend (book));</div><div class='del'>-	ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	/* XXX use ldap_search */</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		/* success */</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	}</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'>-static gboolean</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'>-</div><div class='del'>-	g_assert (bl-&gt;priv-&gt;connected == FALSE);</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_url_parse ((char*)uri, &amp;lud);</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 389 */</div><div class='del'>-		if (bl-&gt;priv-&gt;ldap_port == 0)</div><div class='del'>-			bl-&gt;priv-&gt;ldap_port = 389;</div><div class='del'>-		bl-&gt;priv-&gt;ldap_rootdn = g_strdup(lud-&gt;lud_dn);</div><div class='del'>-</div><div class='del'>-		ldap_free_urldesc(lud);</div><div class='del'>-</div><div class='del'>-		pas_backend_ldap_ensure_connected(bl);</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'>-/* 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'>-			     Evolution_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 (</div><div class='del'>-		backend, listener,</div><div class='del'>-		pas_backend_ldap_get_vcard,</div><div class='del'>-		pas_backend_ldap_can_write,</div><div class='del'>-		pas_backend_ldap_can_write_card);</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, Evolution_BookListener_Success);</div><div class='del'>-	} else {</div><div class='del'>-		/* Open the book. */</div><div class='del'>-		pas_book_respond_open (</div><div class='del'>-			book, Evolution_BookListener_Success);</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_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 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'>-	backend-&gt;priv-&gt;ldap = NULL;</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_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_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'>-	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'>-</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'>-	priv-&gt;connected = FALSE;</div><div class='del'>-	priv-&gt;clients   = NULL;</div><div class='del'>-	priv-&gt;uri       = NULL;</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_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 a59cdf3857..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-ldap.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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, Helix Code, 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 3d315c2faf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-backend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,162 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-gboolean</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'>-			Evolution_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'>-/**</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'>-</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 a1d1a291fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-backend.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</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'>- *    Evolution_Book interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-	gboolean (*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, Evolution_BookListener listener);</div><div class='del'>-	void (*remove_client) (PASBackend *backend, PASBook *book);</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'>-gboolean    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'>-gboolean    pas_backend_add_client         (PASBackend             *backend,</div><div class='del'>-					    Evolution_BookListener  listener);</div><div class='del'>-void        pas_backend_remove_client      (PASBackend             *backend,</div><div class='del'>-					    PASBook                *book);</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 626c7420e2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-factory.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-book-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,639 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "pas-book-factory.h"</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#define PAS_BOOK_FACTORY_GOAD_ID "evolution:addressbook-server"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass          *pas_book_factory_parent_class;</div><div class='del'>-POA_Evolution_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'>-	Evolution_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'>-</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'>-/* 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'>-				 Evolution_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'>-		Evolution_BookListener_respond_open_book (</div><div class='del'>-			listener,</div><div class='del'>-			Evolution_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'>-		Evolution_BookListener_respond_open_book (</div><div class='del'>-			listener,</div><div class='del'>-			Evolution_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'>-	Evolution_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'>-		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'>-		if (!pas_backend_add_client (backend, listener))</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		pas_backend_load_uri (backend, uri);</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 Evolution_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	PASBookFactoryQueuedRequest *request;</div><div class='del'>-	Evolution_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_Evolution_BookFactory_open_book (PortableServer_Servant        servant,</div><div class='del'>-				      const CORBA_char             *uri,</div><div class='del'>-				      const Evolution_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'>-		Evolution_BookListener_respond_open_book (</div><div class='del'>-			listener,</div><div class='del'>-			Evolution_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_Evolution_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_Evolution_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_Evolution_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'>-#ifdef USING_OAF</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-register_factory (CORBA_Object obj)</div><div class='del'>-{</div><div class='del'>-	OAF_RegistrationResult result;</div><div class='del'>-</div><div class='del'>-	puts ("about to register addressbook");</div><div class='del'>-</div><div class='del'>-	result = oaf_active_server_register (PAS_BOOK_FACTORY_OAF_ID, obj);</div><div class='del'>-</div><div class='del'>-	switch (result) {</div><div class='del'>-	case OAF_REG_SUCCESS:</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'>-		return FALSE;</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'>-		return FALSE;</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'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-register_factory (CORBA_Object obj)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	ret = goad_server_register (NULL, obj, PAS_BOOK_FACTORY_GOAD_ID, "server", &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_activate: Exception "</div><div class='del'>-			   "registering PASBookFactory!\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'>-	switch (ret) {</div><div class='del'>-	case 0:</div><div class='del'>-		return TRUE;</div><div class='del'>-	case -2:</div><div class='del'>-		g_message ("pas_book_factory_activate: Another "</div><div class='del'>-			   "PASBookFactory is already running.\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	case -1:</div><div class='del'>-	default:</div><div class='del'>-		g_message ("pas_book_factory_activate: Error "</div><div class='del'>-			   "registering PASBookFactory!\n");</div><div class='del'>-		return FALSE;</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'>- * pas_book_factory_activate:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_factory_activate (PASBookFactory *factory)</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'>-</div><div class='del'>-	register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (factory)));</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'>-}</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'>-	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_Evolution_BookFactory__epv *</div><div class='del'>-pas_book_factory_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_BookFactory__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_BookFactory__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;open_book = impl_Evolution_BookFactory_open_book;</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.Evolution_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 7e4690adf1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-factory.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-book-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000, Helix Code, 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_activate         (PASBookFactory               *factory);</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 4e1c8697aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-book-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +0,0 @@</div><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, Helix Code, 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_Evolution_BookView__vepv pas_book_view_vepv;</div><div class='del'>-</div><div class='del'>-struct _PASBookViewPrivate {</div><div class='del'>-	Evolution_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_Evolution_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_Evolution_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'>-	Evolution_BookViewListener_signal_card_changed (</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'>-	Evolution_BookViewListener_signal_card_removed (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, (Evolution_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_Evolution_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_Evolution_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'>-	Evolution_BookViewListener_signal_card_added (</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'>-	Evolution_BookViewListener_signal_sequence_complete (</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'>-static gboolean</div><div class='del'>-pas_book_view_construct (PASBookView                *book_view,</div><div class='del'>-			 Evolution_BookViewListener  listener)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_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_Evolution_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_Evolution_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'>-	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 (Evolution_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'>-</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_Evolution_BookView__epv *</div><div class='del'>-pas_book_view_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_BookView__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_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.Evolution_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 b9cdbee876..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-view.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-book-view.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'>-/*</div><div class='del'>- * A wrapper object which exports the Evolution_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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-</div><div class='del'>-PASBookView                *pas_book_view_new                (Evolution_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'>-</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 55caf1dce7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-book.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,677 +0,0 @@</div><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, Helix Code, 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 "pas-book.h"</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *pas_book_parent_class;</div><div class='del'>-POA_Evolution_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'>-	Evolution_BookListener  listener;</div><div class='del'>-	PASBookGetVCardFn       get_vcard;</div><div class='del'>-	PASBookCanWriteFn       can_write;</div><div class='del'>-	PASBookCanWriteCardFn   can_write_card;</div><div class='del'>-</div><div class='del'>-	GList                  *request_queue;</div><div class='del'>-	gint                    idle_id;</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;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;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_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;idle_id == 0) {</div><div class='del'>-		book-&gt;priv-&gt;idle_id = g_idle_add ((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;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;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;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;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_book_view (PASBook *book, const Evolution_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;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;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_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_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 CORBA_char *</div><div class='del'>-impl_Evolution_Book_get_vcard (PortableServer_Servant servant,</div><div class='del'>-			       const Evolution_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'>-	char       *vcard;</div><div class='del'>-	CORBA_char *retval;</div><div class='del'>-</div><div class='del'>-	vcard = (book-&gt;priv-&gt;get_vcard) (book, (const char *) id);</div><div class='del'>-	retval = CORBA_string_dup (vcard);</div><div class='del'>-	g_free (vcard);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_boolean</div><div class='del'>-impl_Evolution_Book_can_write (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'>-	CORBA_boolean retval;</div><div class='del'>-</div><div class='del'>-	retval = (book-&gt;priv-&gt;can_write) (book);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_boolean</div><div class='del'>-impl_Evolution_Book_can_write_card (PortableServer_Servant servant,</div><div class='del'>-				    const Evolution_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'>-	CORBA_boolean retval;</div><div class='del'>-</div><div class='del'>-	retval = (book-&gt;priv-&gt;can_write_card) (book, (const char *) id);</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'>-impl_Evolution_Book_create_card (PortableServer_Servant servant,</div><div class='del'>-				 const Evolution_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_Evolution_Book_remove_card (PortableServer_Servant servant,</div><div class='del'>-				 const Evolution_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_Evolution_Book_modify_card (PortableServer_Servant servant,</div><div class='del'>-				 const Evolution_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_Evolution_Book_get_cursor (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_Evolution_Book_get_book_view (PortableServer_Servant servant,</div><div class='del'>-				   const Evolution_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_Evolution_Book_check_connection (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'>-/**</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'>-Evolution_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'>-		       Evolution_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 == Evolution_BookListener_Success) {</div><div class='del'>-		Evolution_BookListener_respond_open_book (</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'>-		Evolution_BookListener_respond_open_book (</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'>-			 Evolution_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'>-	Evolution_BookListener_respond_create_card (</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'>-			 Evolution_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'>-	Evolution_BookListener_respond_remove_card (</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'>-			 Evolution_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'>-	Evolution_BookListener_respond_modify_card (</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_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'>-			     Evolution_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'>-	Evolution_BookListener_respond_get_cursor (</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_cursor:</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'>-				Evolution_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'>-	Evolution_BookListener_respond_get_view (</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_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'>-	Evolution_BookListener_report_connection_status (</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'>-static gboolean</div><div class='del'>-pas_book_construct (PASBook                *book,</div><div class='del'>-		    PASBackend             *backend,</div><div class='del'>-		    Evolution_BookListener  listener,</div><div class='del'>-		    PASBookGetVCardFn       get_vcard,</div><div class='del'>-		    PASBookCanWriteFn       can_write,</div><div class='del'>-		    PASBookCanWriteCardFn   can_write_card)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_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'>-	g_assert (get_vcard != NULL);</div><div class='del'>-	g_assert (can_write != NULL);</div><div class='del'>-	g_assert (can_write_card != NULL);</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_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_Evolution_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;get_vcard = get_vcard;</div><div class='del'>-	book-&gt;priv-&gt;can_write = can_write;</div><div class='del'>-	book-&gt;priv-&gt;can_write_card = can_write_card;</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'>-	      Evolution_BookListener  listener,</div><div class='del'>-	      PASBookGetVCardFn       get_vcard,</div><div class='del'>-	      PASBookCanWriteFn       can_write,</div><div class='del'>-	      PASBookCanWriteCardFn   can_write_card)</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'>-	g_return_val_if_fail (get_vcard != NULL,             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'>-				  get_vcard, can_write, can_write_card)) {</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'>-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'>-		PASRequest *req = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_free (req-&gt;id);</div><div class='del'>-		g_free (req-&gt;vcard);</div><div class='del'>-		g_free (req);</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'>-	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'>-</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_Evolution_Book__epv *</div><div class='del'>-pas_book_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Book__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Book__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;get_vcard        = impl_Evolution_Book_get_vcard;</div><div class='del'>-	epv-&gt;can_write        = impl_Evolution_Book_can_write;</div><div class='del'>-	epv-&gt;can_write_card   = impl_Evolution_Book_can_write_card;</div><div class='del'>-	epv-&gt;create_card      = impl_Evolution_Book_create_card;</div><div class='del'>-	epv-&gt;remove_card      = impl_Evolution_Book_remove_card;</div><div class='del'>-	epv-&gt;modify_card      = impl_Evolution_Book_modify_card;</div><div class='del'>-	epv-&gt;check_connection = impl_Evolution_Book_check_connection;</div><div class='del'>-	epv-&gt;get_cursor       = impl_Evolution_Book_get_cursor;</div><div class='del'>-	epv-&gt;get_book_view    = impl_Evolution_Book_get_book_view;</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.Evolution_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;idle_id       = 0;</div><div class='del'>-	book-&gt;priv-&gt;request_queue = NULL;</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 43a94b6600..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-book.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'>- * A wrapper object which exports the Evolution_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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-</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'>-	GetCursor,</div><div class='del'>-	GetBookView,</div><div class='del'>-	CheckConnection</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'>-	char                      *search;</div><div class='del'>-	Evolution_BookViewListener listener;</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 char *   (*PASBookGetVCardFn)     (PASBook *book, const char *id);</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'>-						       	Evolution_BookListener             listener,</div><div class='del'>-						       	PASBookGetVCardFn                  get_vcard,</div><div class='del'>-							PASBookCanWriteFn                  can_write,</div><div class='del'>-							PASBookCanWriteCardFn              can_write_card);</div><div class='del'>-PASBackend             *pas_book_get_backend           (PASBook                           *book);</div><div class='del'>-Evolution_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'>-</div><div class='del'>-void                    pas_book_respond_open          (PASBook                           *book,</div><div class='del'>-						       	Evolution_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_create        (PASBook                           *book,</div><div class='del'>-						       	Evolution_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'>-						       	Evolution_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_modify        (PASBook                           *book,</div><div class='del'>-						       	Evolution_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_get_cursor    (PASBook                           *book,</div><div class='del'>-						       	Evolution_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'>-						     	Evolution_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'>-gboolean		pas_book_can_write             (PASBook                           *book);</div><div class='del'>-gboolean		pas_book_can_write_card        (PASBook                           *book,</div><div class='del'>-							const char                        *id);</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 c2bbe1c9b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-card-cursor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/backend/pas/pas-card-cursor.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'>- * 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@helixcode.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 "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_Evolution_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_Evolution_CardCursor__epv *</div><div class='del'>-pas_card_cursor_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_CardCursor__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_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;get_length = impl_pas_card_cursor_get_length;</div><div class='del'>-	epv-&gt;get_nth    = 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.Evolution_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'>-			   Evolution_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 Evolution_CardCursor</div><div class='del'>-create_cursor (BonoboObject *cursor)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_CardCursor *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_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_Evolution_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 (Evolution_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'>-	Evolution_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 300e3e3ce1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-card-cursor.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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'>-					  Evolution_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_Evolution_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/contact-editor/.cvsignore b/addressbook/contact-editor/.cvsignore<br/>deleted file mode 100644<br/>index 6fd0b5075c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/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/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am<br/>deleted file mode 100644<br/>index d7729421b1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-CPPFLAGS =					\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)			\</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)/widgets/e-table		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"contact-editor\"</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-categories.c		\</div><div class='del'>-	e-contact-editor-categories.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'>-</div><div class='del'>-noinst_PROGRAMS =		\</div><div class='del'>-	contact-editor-test</div><div class='del'>-</div><div class='del'>-contact_editor_test_SOURCES = 	\</div><div class='del'>-	test-editor.c</div><div class='del'>-</div><div class='del'>-contact_editor_test_LDADD =					\</div><div class='del'>-	libecontacteditor.a					\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/addressbook/ename/libename.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la			\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)					\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/widgets/e-table/libetable.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)/widgets/e-text/libetext.a		\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</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'>-	fullname.glade			\</div><div class='del'>-	categories.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(glade_DATA)		\</div><div class='del'>-	e-contact-editor-strings.h	\</div><div class='del'>-	fullname-strings.h		\</div><div class='del'>-	categories-strings.h</div><div class='head'>diff --git a/addressbook/contact-editor/arrow.png b/addressbook/contact-editor/arrow.png<br/>deleted file mode 100644<br/>index b102356c78..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/arrow.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/arrow.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/briefcase.png b/addressbook/contact-editor/briefcase.png<br/>deleted file mode 100644<br/>index dd59b8fd39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/briefcase.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/briefcase.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/categories-strings.h b/addressbook/contact-editor/categories-strings.h<br/>deleted file mode 100644<br/>index 813018a00e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/categories-strings.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/categories-strings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("categories");</div><div class='del'>-gchar *s = N_("Item(s) belong to these categories:");</div><div class='del'>-gchar *s = N_("Available Categories:");</div><div class='head'>diff --git a/addressbook/contact-editor/categories.glade b/addressbook/contact-editor/categories.glade<br/>deleted file mode 100644<br/>index bf78008940..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/categories.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/categories.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +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;categories&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;categories&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;False&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;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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;categories-strings.h&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;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;categories&lt;/name&gt;</div><div class='del'>-  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;categories&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;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'>-    &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;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-categories&lt;/name&gt;</div><div class='del'>-      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-      &lt;rows&gt;4&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel1&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;Item(s) belong to these categories:&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel2&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;Available Categories:&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;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-categories&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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade<br/>deleted file mode 100644<br/>index 7f11886b28..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/contact-editor.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/contact-editor.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2331 +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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-contact-editor-strings.h&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;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;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='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;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='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;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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;accellabel-fileas&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;File As:&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;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;GtkAccelLabel&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_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;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;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'>-</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'>-</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'>-</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'>-</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'>-</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;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;alignment10&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;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'>-</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;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;address-label&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;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;text-address&lt;/focus_target&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;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;B_usiness&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;alignment12&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;/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;alignment14&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;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;entry-contacts&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;/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;label34&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.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;label35&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Company:&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'>-      &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;label21&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Department:&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;label22&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;label23&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Profession:&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;label24&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;label25&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Spouse:&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;label31&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Birthday:&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;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;label30&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Assistant'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;label29&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;label32&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;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;GnomeDateEdit&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dateedit-anniversary&lt;/name&gt;</div><div class='del'>-	  &lt;show_time&gt;False&lt;/show_time&gt;</div><div class='del'>-	  &lt;use_24_format&gt;False&lt;/use_24_format&gt;</div><div class='del'>-	  &lt;week_start_monday&gt;False&lt;/week_start_monday&gt;</div><div class='del'>-	  &lt;lower_hour&gt;7&lt;/lower_hour&gt;</div><div class='del'>-	  &lt;upper_hour&gt;19&lt;/upper_hour&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;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;GnomeDateEdit&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dateedit-birthday&lt;/name&gt;</div><div class='del'>-	  &lt;show_time&gt;False&lt;/show_time&gt;</div><div class='del'>-	  &lt;use_24_format&gt;False&lt;/use_24_format&gt;</div><div class='del'>-	  &lt;week_start_monday&gt;False&lt;/week_start_monday&gt;</div><div class='del'>-	  &lt;lower_hour&gt;7&lt;/lower_hour&gt;</div><div class='del'>-	  &lt;upper_hour&gt;19&lt;/upper_hour&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;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;label33&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;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'>-      &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'>-    &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/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c<br/>deleted file mode 100644<br/>index e58162a06a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-categories.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-editor-categories.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,456 +0,0 @@</div><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-categories.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-categories.h&gt;</div><div class='del'>-#include &lt;e-table.h&gt;</div><div class='del'>-#include &lt;e-table-simple.h&gt;</div><div class='del'>-#include &lt;e-cell-text.h&gt;</div><div class='del'>-#include &lt;e-cell-checkbox.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);</div><div class='del'>-static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);</div><div class='del'>-static void e_contact_editor_categories_set_arg         (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_categories_get_arg         (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_categories_destroy         (GtkObject *object);</div><div class='del'>-static int e_contact_editor_categories_col_count (ETableModel *etc, gpointer data);</div><div class='del'>-static int e_contact_editor_categories_row_count (ETableModel *etc, gpointer data);</div><div class='del'>-static void *e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data);</div><div class='del'>-static void e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data);</div><div class='del'>-static gboolean e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data);</div><div class='del'>-static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data);</div><div class='del'>-static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data);</div><div class='del'>-static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data);</div><div class='del'>-static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data);</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_CATEGORIES</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_categories_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType contact_editor_categories_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!contact_editor_categories_type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo contact_editor_categories_info =</div><div class='del'>-			{</div><div class='del'>-				"EContactEditorCategories",</div><div class='del'>-				sizeof (EContactEditorCategories),</div><div class='del'>-				sizeof (EContactEditorCategoriesClass),</div><div class='del'>-				(GtkClassInitFunc) e_contact_editor_categories_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_contact_editor_categories_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_categories_type = gtk_type_unique (gnome_dialog_get_type (), &amp;contact_editor_categories_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return contact_editor_categories_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_categories_class_init (EContactEditorCategoriesClass *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 ("EContactEditorCategories::categories", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_CATEGORIES);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg = e_contact_editor_categories_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_contact_editor_categories_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_contact_editor_categories_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *builtin_categories[] = {</div><div class='del'>-	"Business",</div><div class='del'>-	"Competition",</div><div class='del'>-	"Favorites",</div><div class='del'>-	"Gifts",</div><div class='del'>-	"Goals/Objectives",</div><div class='del'>-	"Holiday",</div><div class='del'>-	"Holiday Cards",</div><div class='del'>-	"Hot Contacts",</div><div class='del'>-	"Ideas",</div><div class='del'>-	"International",</div><div class='del'>-	"Key Customer",</div><div class='del'>-	"Miscellaneous",</div><div class='del'>-	"Personal",</div><div class='del'>-	"Phone Calls",</div><div class='del'>-	"Status",</div><div class='del'>-	"Strategies",</div><div class='del'>-	"Suppliers",</div><div class='del'>-	"Time &amp; Expenses",</div><div class='del'>-	"VIP",</div><div class='del'>-	"Waiting",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BUILTIN_CATEGORY_COUNT (sizeof(builtin_categories) / sizeof(builtin_categories[0]))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_list_unique(EContactEditorCategories *categories, char *string)</div><div class='del'>-{</div><div class='del'>-	int k;</div><div class='del'>-	char *temp = e_strdup_strip(string);</div><div class='del'>-	char **list = categories-&gt;category_list;</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 (k = 0; k &lt; categories-&gt;list_length; k++) {</div><div class='del'>-		if (!strcmp(list[k], temp)) {</div><div class='del'>-			categories-&gt;selected_list[k] = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (k == categories-&gt;list_length) {</div><div class='del'>-		categories-&gt;selected_list[categories-&gt;list_length] = TRUE;</div><div class='del'>-		list[categories-&gt;list_length++] = temp;</div><div class='del'>-	} else {</div><div class='del'>-		g_free(temp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_parse_categories(EContactEditorCategories *categories)</div><div class='del'>-{</div><div class='del'>-	char *str = categories-&gt;categories;</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'>-	char **list;</div><div class='del'>-	int count = 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;list_length; i++)</div><div class='del'>-		g_free(categories-&gt;category_list[i]);</div><div class='del'>-	g_free(categories-&gt;category_list);</div><div class='del'>-	g_free(categories-&gt;selected_list);</div><div class='del'>-</div><div class='del'>-	for (i = 0; str[i]; i++) {</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'>-				i--;</div><div class='del'>-			break;</div><div class='del'>-		case ',':</div><div class='del'>-			count ++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	list = g_new(char *, count + 1 + BUILTIN_CATEGORY_COUNT);</div><div class='del'>-	categories-&gt;category_list = list;</div><div class='del'>-</div><div class='del'>-	categories-&gt;selected_list = g_new(gboolean, count + 1 + BUILTIN_CATEGORY_COUNT);</div><div class='del'>-</div><div class='del'>-	for (count = 0; count &lt; BUILTIN_CATEGORY_COUNT; count++) {</div><div class='del'>-		list[count] = g_strdup(builtin_categories[count]);</div><div class='del'>-		categories-&gt;selected_list[count] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	categories-&gt;list_length = count;</div><div class='del'>-</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(categories, 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(categories, copy);</div><div class='del'>-	g_free(copy);</div><div class='del'>-	e_table_model_changed(categories-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_categories_entry_change (GtkWidget *entry, </div><div class='del'>-					  EContactEditorCategories *categories)</div><div class='del'>-{</div><div class='del'>-	g_free(categories-&gt;categories);</div><div class='del'>-	categories-&gt;categories = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));</div><div class='del'>-	do_parse_categories(categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define INITIAL_SPEC "&lt;ETableSpecification no-header=\"1\"&gt;    	       \</div><div class='del'>-	&lt;columns-shown&gt;                  			       \</div><div class='del'>-		&lt;column&gt; 0 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 1 &lt;/column&gt;     			       \</div><div class='del'>-	&lt;/columns-shown&gt;                 			       \</div><div class='del'>-	&lt;grouping&gt; &lt;leaf column=\"1\" ascending=\"1\"/&gt; &lt;/grouping&gt;    \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_categories_init (EContactEditorCategories *categories)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ECell *cell_left_just;</div><div class='del'>-	ECell *cell_checkbox;</div><div class='del'>-	ETableHeader *header;</div><div class='del'>-	ETableCol *col;</div><div class='del'>-	GtkWidget *e_table;</div><div class='del'>-</div><div class='del'>-	categories-&gt;list_length = 0;</div><div class='del'>-	categories-&gt;category_list = NULL;</div><div class='del'>-	categories-&gt;selected_list = NULL;</div><div class='del'>-	categories-&gt;categories = NULL;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(categories),</div><div class='del'>-				     GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(categories),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(categories), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/categories.glade", NULL);</div><div class='del'>-	categories-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	table = glade_xml_get_widget(gui, "table-categories");</div><div class='del'>-	gtk_widget_ref(table);</div><div class='del'>-	gtk_container_remove(GTK_CONTAINER(table-&gt;parent), table);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (categories)-&gt;vbox), table, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(table);</div><div class='del'>-</div><div class='del'>-	categories-&gt;entry = glade_xml_get_widget(gui, "entry-categories");</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(categories-&gt;entry), "changed",</div><div class='del'>-			   GTK_SIGNAL_FUNC(e_contact_editor_categories_entry_change), categories);</div><div class='del'>-</div><div class='del'>-	categories-&gt;model = e_table_simple_new(e_contact_editor_categories_col_count, </div><div class='del'>-					       e_contact_editor_categories_row_count,</div><div class='del'>-					       e_contact_editor_categories_value_at,</div><div class='del'>-					       e_contact_editor_categories_set_value_at,</div><div class='del'>-					       e_contact_editor_categories_is_cell_editable,</div><div class='del'>-					       e_contact_editor_categories_duplicate_value,</div><div class='del'>-					       e_contact_editor_categories_free_value,</div><div class='del'>-					       e_contact_editor_categories_initialize_value,</div><div class='del'>-					       e_contact_editor_categories_value_is_empty,</div><div class='del'>-					       categories);</div><div class='del'>-</div><div class='del'>-	header = e_table_header_new();</div><div class='del'>-</div><div class='del'>-	cell_checkbox = e_cell_checkbox_new();</div><div class='del'>-	col = e_table_col_new (0, "",</div><div class='del'>-			       0, 20, cell_checkbox,</div><div class='del'>-			       g_int_compare, TRUE);</div><div class='del'>-	e_table_header_add_column (header, col, 0);</div><div class='del'>-</div><div class='del'>-	cell_left_just = e_cell_text_new (categories-&gt;model, NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	col = e_table_col_new (1, "Category",</div><div class='del'>-			       1.0, 20, cell_left_just,</div><div class='del'>-			       g_str_compare, TRUE);</div><div class='del'>-	e_table_header_add_column (header, col, 1);</div><div class='del'>-</div><div class='del'>-	e_table = e_table_new (header, categories-&gt;model, INITIAL_SPEC);</div><div class='del'>-</div><div class='del'>-	gtk_object_sink(GTK_OBJECT(categories-&gt;model));</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show(e_table);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach_defaults(GTK_TABLE(table),</div><div class='del'>-				  e_table, </div><div class='del'>-				  0, 1,</div><div class='del'>-				  3, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_categories_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (categories-&gt;gui)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(categories-&gt;gui));</div><div class='del'>-</div><div class='del'>-	g_free(categories-&gt;categories);</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;list_length; i++)</div><div class='del'>-		g_free(categories-&gt;category_list[i]);</div><div class='del'>-	g_free(categories-&gt;category_list);</div><div class='del'>-	g_free(categories-&gt;selected_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_editor_categories_new (char *categories)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_categories_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"categories", categories,</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_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *e_contact_editor_categories;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories-&gt;entry), GTK_VALUE_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'>-e_contact_editor_categories_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *e_contact_editor_categories;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(e_contact_editor_categories-&gt;categories);</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'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_contact_editor_categories_col_count (ETableModel *etc, gpointer data)</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_contact_editor_categories_row_count (ETableModel *etc, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);</div><div class='del'>-	return categories-&gt;list_length;</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_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return (void *) categories-&gt;selected_list[row];</div><div class='del'>-	else</div><div class='del'>-		return categories-&gt;category_list[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'>-e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);</div><div class='del'>-	if ( col == 0 ) {</div><div class='del'>-		char **strs;</div><div class='del'>-		int i, j;</div><div class='del'>-		char *string;</div><div class='del'>-		categories-&gt;selected_list[row] = (gboolean) val;</div><div class='del'>-		strs = g_new(char *, categories-&gt;list_length + 1);</div><div class='del'>-		for (i = 0, j = 0; i &lt; categories-&gt;list_length; i++) {</div><div class='del'>-			if (categories-&gt;selected_list[i])</div><div class='del'>-				strs[j++] = categories-&gt;category_list[i];</div><div class='del'>-		}</div><div class='del'>-		strs[j] = 0;</div><div class='del'>-		string = g_strjoinv(", ", strs);</div><div class='del'>-		gtk_entry_set_text(GTK_ENTRY(categories-&gt;entry), string);</div><div class='del'>-		g_free(string);</div><div class='del'>-		g_free(strs);</div><div class='del'>-	}</div><div class='del'>-	if ( col == 1 )</div><div class='del'>-		return;</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_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return col == 0;</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_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return (void *)value;</div><div class='del'>-	else</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_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return;</div><div class='del'>-	else</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_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return NULL;</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 gboolean</div><div class='del'>-e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return value == NULL;</div><div class='del'>-	else</div><div class='del'>-		return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-categories.h b/addressbook/contact-editor/e-contact-editor-categories.h<br/>deleted file mode 100644<br/>index 529ef71b68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-categories.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-editor-categories.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +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-categories.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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_CATEGORIES_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_CATEGORIES_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.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'>-#include &lt;widgets/e-table/e-table-model.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'>-/* EContactEditorCategories - 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_CATEGORIES_TYPE			(e_contact_editor_categories_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR_CATEGORIES(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategories))</div><div class='del'>-#define E_CONTACT_EDITOR_CATEGORIES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategoriesClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CATEGORIES(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CATEGORIES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditorCategories       EContactEditorCategories;</div><div class='del'>-typedef struct _EContactEditorCategoriesClass  EContactEditorCategoriesClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditorCategories</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'>-	char *categories;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-</div><div class='del'>-	int list_length;</div><div class='del'>-	char **category_list;</div><div class='del'>-	gboolean *selected_list;</div><div class='del'>-</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorCategoriesClass</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_categories_new(char *categories);</div><div class='del'>-GtkType    e_contact_editor_categories_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_CATEGORIES_H__ */</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c<br/>deleted file mode 100644<br/>index b2e598fdde..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-fullname.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-editor-fullname.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'>-/* </div><div class='del'>- * e-contact-editor-fullname.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-fullname.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'>-};</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'>-	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_free(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 (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'>-		if (e_contact_editor_fullname-&gt;name)</div><div class='del'>-			e_card_name_free(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'>-	}</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_copy(e_contact_editor_fullname-&gt;name);</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'>-			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 g_strdup(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'>-	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/contact-editor/e-contact-editor-fullname.h b/addressbook/contact-editor/e-contact-editor-fullname.h<br/>deleted file mode 100644<br/>index 409ffc72d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-fullname.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-editor-fullname.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'>-/* e-contact-editor-fullname.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-</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(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/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h<br/>deleted file mode 100644<br/>index d5ac9daf24..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-strings.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-editor-strings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("_Add");</div><div class='del'>-gchar *s = N_("_Delete");</div><div class='del'>-gchar *s = N_("Phone Types");</div><div class='del'>-gchar *s = N_("New phone type");</div><div class='del'>-gchar *s = N_("Add");</div><div class='del'>-gchar *s = N_("New phone type");</div><div class='del'>-gchar *s = N_("Contact Editor");</div><div class='del'>-gchar *s = N_("_Full Name...");</div><div class='del'>-gchar *s = N_("File As:");</div><div class='del'>-gchar *s = N_("Web page address:");</div><div class='del'>-gchar *s = N_("Wants to receive _HTML mail");</div><div class='del'>-gchar *s = N_("Address:");</div><div class='del'>-gchar *s = N_("_Business");</div><div class='del'>-gchar *s = N_("_Home");</div><div class='del'>-gchar *s = N_("Business _Fax");</div><div class='del'>-gchar *s = N_("_Mobile");</div><div class='del'>-gchar *s = N_("Primary Email");</div><div class='del'>-gchar *s = N_("B_usiness");</div><div class='del'>-gchar *s = N_("_This is the mailing address");</div><div class='del'>-gchar *s = N_("C_ontacts...");</div><div class='del'>-gchar *s = N_("Ca_tegories...");</div><div class='del'>-gchar *s = N_("_Job title:");</div><div class='del'>-gchar *s = N_("_Company:");</div><div class='del'>-gchar *s = N_("General");</div><div class='del'>-gchar *s = N_("_Department:");</div><div class='del'>-gchar *s = N_("_Office:");</div><div class='del'>-gchar *s = N_("_Profession:");</div><div class='del'>-gchar *s = N_("_Nickname:");</div><div class='del'>-gchar *s = N_("_Spouse:");</div><div class='del'>-gchar *s = N_("_Birthday:");</div><div class='del'>-gchar *s = N_("_Assistant's name:");</div><div class='del'>-gchar *s = N_("_Manager's Name:");</div><div class='del'>-gchar *s = N_("Anni_versary:");</div><div class='del'>-gchar *s = N_("No_tes:");</div><div class='del'>-gchar *s = N_("Details");</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c<br/>deleted file mode 100644<br/>index 17a6c52119..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1701 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include &lt;e-contact-editor-fullname.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-categories.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;e-util/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	ADD_CARD,</div><div class='del'>-	COMMIT_CARD,</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 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'>-</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_CARD,</div><div class='del'>-	ARG_IS_NEW_CARD</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'>-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::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'>-</div><div class='del'>-  contact_editor_signals[ADD_CARD] =</div><div class='del'>-	  gtk_signal_new ("add_card",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),</div><div class='del'>-			  gtk_marshal_NONE__OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 1,</div><div class='del'>-			  GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_editor_signals[COMMIT_CARD] =</div><div class='del'>-	  gtk_signal_new ("commit_card",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),</div><div class='del'>-			  gtk_marshal_NONE__OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 1,</div><div class='del'>-			  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", DATADIR "/evolution/", 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'>-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int which;</div><div class='del'>-	gchar *string;</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'>-	string = gtk_entry_get_text(entry);</div><div class='del'>-	phone = e_card_phone_new();</div><div class='del'>-	phone-&gt;number = string;</div><div class='del'>-	e_card_simple_set_phone(editor-&gt;simple, editor-&gt;phone_choice[which - 1], phone);</div><div class='del'>-	phone-&gt;number = NULL;</div><div class='del'>-	e_card_phone_free(phone);</div><div class='del'>-	set_fields(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 = 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'>-</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'>-	address-&gt;data = gtk_editable_get_chars(editable, 0, -1);</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_free(address);</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-&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-&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 (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 = gtk_entry_get_text(file_as);</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 (!name) return 0;</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'>-			return i;</div><div class='del'>-		}</div><div class='del'>-		g_free(trystring);</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'>-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 (style == -1) {</div><div class='del'>-		string = g_strdup(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'>-	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'>-			string = name_to_style(editor-&gt;name, editor-&gt;company, i);</div><div class='del'>-			strings = g_list_append(strings, string);</div><div class='del'>-		}</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'>-	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'>-		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'>-	GtkWidget *file_as;</div><div class='del'>-	int style = 0;</div><div class='del'>-</div><div class='del'>-	file_as = glade_xml_get_widget(editor-&gt;gui, "entry-file-as");</div><div class='del'>-</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		style = file_as_get_style(editor);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_card_name_free(editor-&gt;name);</div><div class='del'>-	editor-&gt;name = e_card_name_from_string(gtk_entry_get_text(GTK_ENTRY(widget)));</div><div class='del'>-	</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		file_as_set_style(editor, style);</div><div class='del'>-	}</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'>-	GtkWidget *file_as;</div><div class='del'>-</div><div class='del'>-	file_as = glade_xml_get_widget(editor-&gt;gui, "entry-file-as");</div><div class='del'>-</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		style = file_as_get_style(editor);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free(editor-&gt;company);</div><div class='del'>-	</div><div class='del'>-	editor-&gt;company = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)));</div><div class='del'>-	</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		file_as_set_style(editor, style);</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'>-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'>-}</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'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-	result = gnome_dialog_run_and_close (dialog);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		ECardName *name;</div><div class='del'>-		GtkWidget *fname_widget;</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'>-		e_card_name_free(editor-&gt;name);</div><div class='del'>-		editor-&gt;name = e_card_name_copy(name);</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'>-			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'>-	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;</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'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		categories = 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_contact_editor_categories_new(categories));</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-	result = gnome_dialog_run (dialog);</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'>-			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'>-	if (!entry)</div><div class='del'>-		g_free(categories);</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)</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;is_new_card)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],</div><div class='del'>-				 ce-&gt;card);</div><div class='del'>-	else</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],</div><div class='del'>-				 ce-&gt;card);</div><div class='del'>-</div><div class='del'>-	/* FIXME: should we set the ce-&gt;is_new_card here or have the client code</div><div class='del'>-	 * set the "is_new_card" argument on the contact editor object?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ce-&gt;is_new_card = FALSE;</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'>-	g_assert (ce-&gt;app != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (ce-&gt;app);</div><div class='del'>-	ce-&gt;app = NULL;</div><div class='del'>-</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'>-/* 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);</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'>-	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 as VCard", card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Menu bar */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_new_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Appointment"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Meeting Re_quest"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Mail Message"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Task"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Task _Request"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Journal Entry"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Note"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_page_setup_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Memo Style"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Define Print _Styles..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_NEW_SUBTREE (file_new_menu),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: S_end"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_ITEM (file_save_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (file_save_as_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Save Attac_hments..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Delete"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Move to Folder..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Cop_y to Folder..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Page Set_up"), file_page_setup_menu),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print Pre_view"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PRINT_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CLOSE_ITEM (file_close_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo edit_object_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE ("FIXME: what goes here?", NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo edit_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_UNDO_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_REDO_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CUT_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_COPY_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PASTE_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Paste _Special..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CLEAR_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SELECT_ALL_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Mark as U_nread"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_FIND_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Object"), edit_object_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_previous_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Fi_rst Item in Folder"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_next_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Last Item in Folder"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_toolbars_menu[] = {</div><div class='del'>-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,</div><div class='del'>-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },</div><div class='del'>-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,</div><div class='del'>-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_menu[] = {</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Pre_vious"), view_previous_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Ne_xt"), view_next_menu),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Toolbars"), view_toolbars_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo insert_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _File..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: It_em..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Object..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo format_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Font..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Paragraph..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo tools_forms_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Desi_gn This Form"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: D_esign a Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Publish _Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Pu_blish Form As..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Script _Debugger"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo tools_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Spelling..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Forms"), tools_forms_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo actions_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _New Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Contact from Same Company"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Letter to Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Message to Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New Meetin_g with Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Plan a Meeting..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Task for Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Journal Entry for Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Flag for Follow Up..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Display Map of Address"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Open Web Page"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Forward as _vCard"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo help_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE ("FIXME: fix Bonobo so it supports help items!", NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo main_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Insert"), insert_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_HELP_TREE (help_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the menu bar for the contact editor */</div><div class='del'>-static void</div><div class='del'>-create_menu (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandlerMenuItem *list;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_menubar (ce-&gt;uih);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (main_menu, ce);</div><div class='del'>-	bonobo_ui_handler_menu_add_list (ce-&gt;uih, "/", list);</div><div class='del'>-}</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 (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);</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Toolbar */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo toolbar[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Save and Close"),</div><div class='del'>-				N_("Save the appointment and close the dialog box"),</div><div class='del'>-				tb_save_and_close_cb,</div><div class='del'>-				GNOME_STOCK_PIXMAP_SAVE),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print..."),</div><div class='del'>-			       N_("Print this item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Insert File..."),</div><div class='del'>-			       N_("Insert a file as an attachment"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Recurrence..."),</div><div class='del'>-			       N_("Configure recurrence rules"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Invite Attendees..."),</div><div class='del'>-			       N_("Invite attendees to a meeting"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Delete"),</div><div class='del'>-			       N_("Delete this item"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Previous"),</div><div class='del'>-			       N_("Go to the previous item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Next"),</div><div class='del'>-			       N_("Go to the next item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Help"),</div><div class='del'>-				N_("See online help"), NULL, GNOME_STOCK_PIXMAP_HELP),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the toolbar for the contact editor */</div><div class='del'>-static void</div><div class='del'>-create_toolbar (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandlerToolbarItem *list;</div><div class='del'>-	GnomeDockItem *dock_item;</div><div class='del'>-	GtkWidget *toolbar_child;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_toolbar (ce-&gt;uih, "Toolbar");</div><div class='del'>-</div><div class='del'>-	/* Fetch the toolbar.  What a pain in the ass. */</div><div class='del'>-</div><div class='del'>-	dock_item = gnome_app_get_dock_item_by_name (GNOME_APP (ce-&gt;app), GNOME_APP_TOOLBAR_NAME);</div><div class='del'>-	g_assert (dock_item != NULL);</div><div class='del'>-</div><div class='del'>-	toolbar_child = gnome_dock_item_get_child (dock_item);</div><div class='del'>-	g_assert (toolbar_child != NULL &amp;&amp; GTK_IS_TOOLBAR (toolbar_child));</div><div class='del'>-</div><div class='del'>-	/* Turn off labels as GtkToolbar sucks */</div><div class='del'>-	gtk_toolbar_set_style (GTK_TOOLBAR (toolbar_child), GTK_TOOLBAR_ICONS);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_toolbar_parse_uiinfo_list_with_data (toolbar, ce);</div><div class='del'>-	bonobo_ui_handler_toolbar_add_list (ce-&gt;uih, "/Toolbar", list);</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'>-	close_dialog (ce);</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_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'>-</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 = NULL;</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'>-</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'>-</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'>-	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'>-	set_entry_changed_signals(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-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'>-	/* Build the menu and toolbar */</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;uih = bonobo_ui_handler_new ();</div><div class='del'>-	if (!e_contact_editor-&gt;uih) {</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'>-</div><div class='del'>-	bonobo_ui_handler_set_app (e_contact_editor-&gt;uih, GNOME_APP (e_contact_editor-&gt;app));</div><div class='del'>-</div><div class='del'>-	create_menu (e_contact_editor);</div><div class='del'>-	create_toolbar (e_contact_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 (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;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'>-	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'>-EContactEditor *</div><div class='del'>-e_contact_editor_new (ECard *card, gboolean is_new_card)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</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'>-			"card", card,</div><div class='del'>-			"is_new_card", is_new_card,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (ce-&gt;app);</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_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'>-		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'>-}</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_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'>-	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'>-#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, g_strdup(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'>-	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'>-	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'>-	}</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'>-	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'>-	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'>-}</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'>-	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'>-	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'>-}</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 = 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'>-		gtk_entry_set_text(entry, string);</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'>-</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'>-	set_address_field(editor, -1);</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 *widget;</div><div class='del'>-	</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_TEXT(widget)) {</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(widget);</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'>-			gtk_editable_insert_text(editable, address-&gt;data, strlen(address-&gt;data), &amp;position);</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'>-		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'>-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'>-};</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'>-			gtk_editable_insert_text(editable, value, strlen(value), &amp;position);</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'>-			gtk_editable_insert_text(editable, arbitrary-&gt;value, strlen(arbitrary-&gt;value), &amp;position);</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(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'>-		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'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "file_as",       &amp;file_as,</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'>-			       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'>-		/* 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_free(editor-&gt;name);</div><div class='del'>-		editor-&gt;name = e_card_name_copy(name);</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-anniversary");</div><div class='del'>-		if (anniversary &amp;&amp; widget &amp;&amp; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};</div><div class='del'>-			time_t time_val;</div><div class='del'>-			GnomeDateEdit *dateedit;</div><div class='del'>-</div><div class='del'>-			time_struct.tm_mday = anniversary-&gt;day;</div><div class='del'>-			time_struct.tm_mon = anniversary-&gt;month - 1;</div><div class='del'>-			time_struct.tm_year = anniversary-&gt;year - 1900;</div><div class='del'>-			time_val = mktime(&amp;time_struct);</div><div class='del'>-			dateedit = GNOME_DATE_EDIT(widget);</div><div class='del'>-			gnome_date_edit_set_time(dateedit, time_val);</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 (bday &amp;&amp; widget &amp;&amp; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};</div><div class='del'>-			time_t time_val;</div><div class='del'>-			GnomeDateEdit *dateedit;</div><div class='del'>-			time_struct.tm_mday = bday-&gt;day;</div><div class='del'>-			time_struct.tm_mon = bday-&gt;month - 1;</div><div class='del'>-			time_struct.tm_year = bday-&gt;year - 1900;</div><div class='del'>-			time_val = mktime(&amp;time_struct);</div><div class='del'>-			dateedit = GNOME_DATE_EDIT(widget);</div><div class='del'>-			gnome_date_edit_set_time(dateedit, time_val);</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 = gtk_editable_get_chars(editable, 0, -1);</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'>-		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 = 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'>-		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'>-		struct tm time_struct;</div><div class='del'>-		time_t time_val;</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 = gtk_editable_get_chars(editable, 0, -1);</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'>-			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;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; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));</div><div class='del'>-			gmtime_r(&amp;time_val,</div><div class='del'>-				 &amp;time_struct);</div><div class='del'>-			anniversary = g_new(ECardDate, 1);</div><div class='del'>-			anniversary-&gt;day   = time_struct.tm_mday;</div><div class='del'>-			anniversary-&gt;month = time_struct.tm_mon + 1;</div><div class='del'>-			anniversary-&gt;year  = time_struct.tm_year + 1900;</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       "anniversary", anniversary,</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; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));</div><div class='del'>-			gmtime_r(&amp;time_val,</div><div class='del'>-				 &amp;time_struct);</div><div class='del'>-			bday = g_new(ECardDate, 1);</div><div class='del'>-			bday-&gt;day   = time_struct.tm_mday;</div><div class='del'>-			bday-&gt;month = time_struct.tm_mon + 1;</div><div class='del'>-			bday-&gt;year  = time_struct.tm_year + 1900;</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       "birth_date", bday,</div><div class='del'>-				       NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h<br/>deleted file mode 100644<br/>index 8eae2bf1b5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-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-editor.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo.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'>-</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'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIHandler *uih;</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'>-	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'>-	</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'>-</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 (* add_card) (EContactEditor *ce, ECard *card);</div><div class='del'>-	void (* commit_card) (EContactEditor *ce, ECard *card);</div><div class='del'>-	void (* editor_closed) (EContactEditor *ce);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EContactEditor *e_contact_editor_new (ECard *card, gboolean is_new_card);</div><div class='del'>-GtkType    e_contact_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_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c<br/>deleted file mode 100644<br/>index 51cb2619e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-save-as.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/e-contact-save-as.c</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.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;e-contact-save-as.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</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'>-typedef struct {</div><div class='del'>-	GtkFileSelection *filesel;</div><div class='del'>-	ECard *card;</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'>-	char *vcard = e_card_get_vcard(info-&gt;card);</div><div class='del'>-	const char *filename = gtk_file_selection_get_filename(info-&gt;filesel);</div><div class='del'>-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(info-&gt;card));</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'>-	gtk_object_unref(GTK_OBJECT(info-&gt;card));</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'>-	gtk_object_unref(GTK_OBJECT(info-&gt;card));</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_contact_save_as(char *title, ECard *card)</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'>-	info-&gt;filesel = filesel;</div><div class='del'>-	info-&gt;card = e_card_duplicate(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='head'>diff --git a/addressbook/contact-editor/e-contact-save-as.h b/addressbook/contact-editor/e-contact-save-as.h<br/>deleted file mode 100644<br/>index e6af13e8fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-save-as.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-#include &lt;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'>-void</div><div class='del'>-e_contact_save_as(gchar *title, ECard *card);</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/contact-editor/email.png b/addressbook/contact-editor/email.png<br/>deleted file mode 100644<br/>index f3ff02e343..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/email.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/email.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/fullname-strings.h b/addressbook/contact-editor/fullname-strings.h<br/>deleted file mode 100644<br/>index 0c84dfdc8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/fullname-strings.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/fullname-strings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Check Full Name");</div><div class='del'>-gchar *s = N_("_Title:");</div><div class='del'>-gchar *s = N_("_First:");</div><div class='del'>-gchar *s = N_("_Middle:");</div><div class='del'>-gchar *s = N_("_Last:");</div><div class='del'>-gchar *s = N_("_Suffix:");</div><div class='del'>-gchar *s = N_("\n"</div><div class='del'>-              "Mr.\n"</div><div class='del'>-              "Mrs.\n"</div><div class='del'>-              "Dr.\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("\n"</div><div class='del'>-              "Sr.\n"</div><div class='del'>-              "Jr.\n"</div><div class='del'>-              "I\n"</div><div class='del'>-              "II\n"</div><div class='del'>-              "III\n"</div><div class='del'>-              "Esq.\n"</div><div class='del'>-              "");</div><div class='head'>diff --git a/addressbook/contact-editor/fullname.glade b/addressbook/contact-editor/fullname.glade<br/>deleted file mode 100644<br/>index 8f811c5616..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/fullname.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/fullname.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,391 +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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;fullname-strings.h&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;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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel1&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel2&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel3&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel4&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel5&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;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;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'>-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'>-    &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;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'>-  &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/contact-editor/head.png b/addressbook/contact-editor/head.png<br/>deleted file mode 100644<br/>index ca00b75f92..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/head.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/head.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/netfreebusy.png b/addressbook/contact-editor/netfreebusy.png<br/>deleted file mode 100644<br/>index 09ec8a2a5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/netfreebusy.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/netfreebusy.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/netmeeting.png b/addressbook/contact-editor/netmeeting.png<br/>deleted file mode 100644<br/>index 4cb90c121e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/netmeeting.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/netmeeting.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/phone.png b/addressbook/contact-editor/phone.png<br/>deleted file mode 100644<br/>index ebec84ba0b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/phone.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/phone.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/snailmail.png b/addressbook/contact-editor/snailmail.png<br/>deleted file mode 100644<br/>index 647ae8f68c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/snailmail.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/snailmail.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/test-editor.c b/addressbook/contact-editor/test-editor.c<br/>deleted file mode 100644<br/>index 80db2fe848..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/test-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/test-editor.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'>- * test-editor.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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@helixcode.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, Helix Code, 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 (cardstr), TRUE);</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 (cardstr), TRUE);</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/contact-editor/web.png b/addressbook/contact-editor/web.png<br/>deleted file mode 100644<br/>index 3211a11b19..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/web.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/contact-editor/web.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/demo/.cvsignore b/addressbook/demo/.cvsignore<br/>deleted file mode 100644<br/>index a0427f184f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/.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'>-evolution-addressbook</div><div class='del'>-test-addressbook
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/demo/Makefile.am b/addressbook/demo/Makefile.am<br/>deleted file mode 100644<br/>index 1a7e4e6d01..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)			\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text		\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-table		\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-minicard	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook	\</div><div class='del'>-	$(BONOBO_HTML_GNOME_CFLAGS)			\</div><div class='del'>-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"addressbook-demo\"			</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =	\</div><div class='del'>-	test-addressbook</div><div class='del'>-</div><div class='del'>-test_addressbook_SOURCES =		\</div><div class='del'>-	demo.c				\</div><div class='del'>-	e-test-model.c			\</div><div class='del'>-	e-test-model.h</div><div class='del'>-</div><div class='del'>-test_addressbook_LDADD =				\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)			\</div><div class='del'>-	$(BONOBO_HTML_GNOME_LIBS)			\</div><div class='del'>-	$(top_builddir)/widgets/e-minicard/libeminicard.a	\</div><div class='del'>-	$(top_builddir)/widgets/e-table/libetable.a	\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la		\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la</div><div class='del'>-</div><div class='del'>-test_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf`</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-factory.c		\</div><div class='del'>-	addressbook-widget.c		\</div><div class='del'>-	addressbook-widget.h		\</div><div class='del'>-	addressbook.c			\</div><div class='del'>-	addressbook.h			\</div><div class='del'>-	e-test-model.c			\</div><div class='del'>-	e-test-model.h</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDADD =				\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(BONOBO_HTML_GNOME_LIBS)			\</div><div class='del'>-	$(top_builddir)/widgets/e-minicard/libeminicard.a	\</div><div class='del'>-	$(top_builddir)/widgets/e-table/libetable.a	\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la		\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf`</div><div class='del'>-</div><div class='del'>-gnorbadir = $(sysconfdir)/CORBA/servers</div><div class='del'>-gnorba_DATA = addressbook.gnorba</div><div class='head'>diff --git a/addressbook/demo/addressbook-factory.c b/addressbook/demo/addressbook-factory.c<br/>deleted file mode 100644<br/>index cf59177f84..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/addressbook-factory.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/addressbook-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/**</div><div class='del'>- * sample-control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</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'>-		"evolution-addressbook", "0.0",</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'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	addressbook_factory_init ();</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/demo/addressbook-widget.c b/addressbook/demo/addressbook-widget.c<br/>deleted file mode 100644<br/>index dfe531c787..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/addressbook-widget.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/addressbook-widget.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,537 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * demo.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *</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, or (at your option)</div><div class='del'>- * 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'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gnome.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-util/e-cursors.h"</div><div class='del'>-#include "e-canvas.h"</div><div class='del'>-#include "e-table-simple.h"</div><div class='del'>-#include "e-table-header.h"</div><div class='del'>-#include "e-table-header-item.h"</div><div class='del'>-#include "e-table-item.h"</div><div class='del'>-#include "e-cell-text.h"</div><div class='del'>-#include "e-cell-checkbox.h"</div><div class='del'>-#include "e-table.h"</div><div class='del'>-#include "e-reflow.h"</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-test-model.h"</div><div class='del'>-</div><div class='del'>-#include "addressbook-widget.h"</div><div class='del'>-</div><div class='del'>-#define COLS 4</div><div class='del'>-</div><div class='del'>-/* Here we define the initial layout of the table.  This is an xml</div><div class='del'>-   format that allows you to change the initial ordering of the</div><div class='del'>-   columns or to do sorting or grouping initially.  This specification</div><div class='del'>-   shows all 5 columns, but moves the importance column nearer to the</div><div class='del'>-   front.  It also sorts by the "Full Name" column (ascending.)</div><div class='del'>-   Sorting and grouping take the model column as their arguments</div><div class='del'>-   (sorting is specified by the "column" argument to the leaf elemnt. */</div><div class='del'>-#define INITIAL_SPEC "&lt;ETableSpecification&gt;                    	       \</div><div class='del'>-	&lt;columns-shown&gt;                  			       \</div><div class='del'>-		&lt;column&gt; 0 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 1 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 2 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 3 &lt;/column&gt;     			       \</div><div class='del'>-	&lt;/columns-shown&gt;                 			       \</div><div class='del'>-	&lt;grouping&gt; &lt;leaf column=\"1\" ascending=\"1\"/&gt; &lt;/grouping&gt;    \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-char *headers[COLS] = {</div><div class='del'>-  "Email",</div><div class='del'>-  "Full Name",</div><div class='del'>-  "Address",</div><div class='del'>-  "Phone"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int window_count = 0;</div><div class='del'>-static GHashTable *models = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_model(ETableModel *model, gchar *filename)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_remove(models, filename);</div><div class='del'>-	g_free(filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ETestModel *</div><div class='del'>-get_model(char *filename)</div><div class='del'>-{</div><div class='del'>-	ETestModel *model;</div><div class='del'>-	gboolean free_filename = FALSE;</div><div class='del'>-</div><div class='del'>-	if ( filename == NULL ) {</div><div class='del'>-		filename = gnome_util_prepend_user_home("addressbook.xml");</div><div class='del'>-		free_filename = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( models == NULL ) {</div><div class='del'>-		models = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model = g_hash_table_lookup(models, filename);</div><div class='del'>-	if ( model ) {</div><div class='del'>-		if (free_filename)</div><div class='del'>-			g_free(filename);</div><div class='del'>-		return model;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( !free_filename )</div><div class='del'>-		filename = g_strdup(filename);</div><div class='del'>-	</div><div class='del'>-	model = E_TEST_MODEL(e_test_model_new(filename));</div><div class='del'>-	g_hash_table_insert(models,</div><div class='del'>-			    filename, model);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(model), "destroy",</div><div class='del'>-			   GTK_SIGNAL_FUNC(remove_model), filename);</div><div class='del'>-</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_address_cb(GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	View *view = (View *) data;</div><div class='del'>-	Address *newadd = g_new(Address, 1);</div><div class='del'>-	newadd-&gt;email = g_strdup("");</div><div class='del'>-	newadd-&gt;phone = g_strdup("");</div><div class='del'>-	newadd-&gt;full_name = g_strdup("");</div><div class='del'>-	newadd-&gt;street = g_strdup("");</div><div class='del'>-	e_test_model_add_column (view-&gt;model, newadd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rebuild_reflow(ETableModel *model, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	View *view = (View *) data;</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if (!reflow)</div><div class='del'>-		return;</div><div class='del'>-	gtk_object_destroy(GTK_OBJECT(reflow-&gt;reflow));</div><div class='del'>-	reflow-&gt;reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( reflow-&gt;canvas ) ),</div><div class='del'>-					      e_reflow_get_type(),</div><div class='del'>-					      "x", (double) 0,</div><div class='del'>-					      "y", (double) 0,</div><div class='del'>-					      "height", (double) reflow-&gt;last_alloc.height,</div><div class='del'>-					      "minimum_width", (double) reflow-&gt;last_alloc.width,</div><div class='del'>-					      NULL );</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; view-&gt;model-&gt;data_count; i++ )</div><div class='del'>-		{</div><div class='del'>-			GnomeCanvasItem *item;</div><div class='del'>-			item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow-&gt;reflow),</div><div class='del'>-						      e_minicard_get_type(),</div><div class='del'>-						      "model", view-&gt;model,</div><div class='del'>-						      "row", i,</div><div class='del'>-						      NULL);</div><div class='del'>-			e_reflow_add_item(E_REFLOW(reflow-&gt;reflow), item);</div><div class='del'>-		}</div><div class='del'>-	e_canvas_item_request_reflow(reflow-&gt;reflow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_reflow(View *view)</div><div class='del'>-{</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if ( !reflow )</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT(view-&gt;model),</div><div class='del'>-			      reflow-&gt;model_changed_id);</div><div class='del'>-	g_free(reflow);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	view-&gt;reflow = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-	View *view = (View *)data;</div><div class='del'>-	if ( view-&gt;reflow ) {</div><div class='del'>-		destroy_reflow(view);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	g_free(view);</div><div class='del'>-	window_count --;</div><div class='del'>-	if ( window_count &lt;= 0 )</div><div class='del'>-		gtk_main_quit();</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'>-	View *view = (View *)data;</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if ( !reflow )</div><div class='del'>-		return;</div><div class='del'>-	reflow-&gt;last_alloc = *allocation;</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;reflow,</div><div class='del'>-			       "height", (double) allocation-&gt;height,</div><div class='del'>-			       NULL );</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;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-&gt;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( reflow-&gt;canvas ), 0, 0, width, allocation-&gt;height );</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;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(ECanvas *canvas, gpointer data)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	View *view = (View *)data;</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if ( !reflow )</div><div class='del'>-		return;</div><div class='del'>-  	gtk_object_get(GTK_OBJECT(reflow-&gt;reflow),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, reflow-&gt;last_alloc.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS(reflow-&gt;canvas), 0, 0, width, reflow-&gt;last_alloc.height );</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) reflow-&gt;last_alloc.height,</div><div class='del'>-			       NULL );	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-canvas_realized(GtkLayout *layout, View *view)</div><div class='del'>-{</div><div class='del'>-	gdk_window_set_back_pixmap( layout-&gt;bin_window, NULL, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_reflow(View *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *inner_vbox;</div><div class='del'>-	GtkWidget *scrollbar;</div><div class='del'>-	int i;</div><div class='del'>-	Reflow *reflow = g_new(Reflow, 1);</div><div class='del'>-	view-&gt;reflow = reflow;</div><div class='del'>-</div><div class='del'>-	view-&gt;type = VIEW_TYPE_REFLOW;</div><div class='del'>-</div><div class='del'>-	/* Next we create our model.  This uses the functions we defined</div><div class='del'>-	   earlier. */</div><div class='del'>-</div><div class='del'>-	inner_vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	reflow-&gt;canvas = e_canvas_new();</div><div class='del'>-	reflow-&gt;rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( reflow-&gt;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-&gt;reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( reflow-&gt;canvas ) ),</div><div class='del'>-					      e_reflow_get_type(),</div><div class='del'>-					      "x", (double) 0,</div><div class='del'>-					      "y", (double) 0,</div><div class='del'>-					      "height", (double) 100,</div><div class='del'>-					      "minimum_width", (double) 100,</div><div class='del'>-					      NULL );</div><div class='del'>-	/* Connect the signals */</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( reflow-&gt;canvas ), "reflow",</div><div class='del'>-			    GTK_SIGNAL_FUNC( resize ),</div><div class='del'>-			    ( gpointer ) view);</div><div class='del'>-	</div><div class='del'>-	for ( i = 0; i &lt; view-&gt;model-&gt;data_count; i++ )</div><div class='del'>-		{</div><div class='del'>-			GnomeCanvasItem *item;</div><div class='del'>-			item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow-&gt;reflow),</div><div class='del'>-						      e_minicard_get_type(),</div><div class='del'>-						      "model", view-&gt;model,</div><div class='del'>-						      "row", i,</div><div class='del'>-						      NULL);</div><div class='del'>-			e_reflow_add_item(E_REFLOW(reflow-&gt;reflow), item);</div><div class='del'>-		}</div><div class='del'>-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( reflow-&gt;canvas ),</div><div class='del'>-					 0, 0,</div><div class='del'>-					 100, 100 );</div><div class='del'>-</div><div class='del'>-	scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(reflow-&gt;canvas)));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( reflow-&gt;canvas ), "size_allocate",</div><div class='del'>-			    GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-			    ( gpointer ) view );</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT(reflow-&gt;canvas), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC(canvas_realized), view);</div><div class='del'>-	</div><div class='del'>-	reflow-&gt;model_changed_id = gtk_signal_connect(GTK_OBJECT( view-&gt;model ), "model_changed",</div><div class='del'>-						      GTK_SIGNAL_FUNC(rebuild_reflow), view);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-</div><div class='del'>-	/* Build the gtk widget hierarchy. */</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(inner_vbox), reflow-&gt;canvas, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(inner_vbox), scrollbar, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	return inner_vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We create a window containing our new table. */</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_table(View *view)</div><div class='del'>-{</div><div class='del'>-	ECell *cell_left_just;</div><div class='del'>-	ETableHeader *e_table_header;</div><div class='del'>-	GtkWidget *e_table;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	view-&gt;type = VIEW_TYPE_TABLE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	  Next we create a header.  The ETableHeader is used in two</div><div class='del'>-	  different way.  The first is the full_header.  This is the</div><div class='del'>-	  list of possible columns in the view.  The second use is</div><div class='del'>-	  completely internal.  Many of the ETableHeader functions are</div><div class='del'>-	  for that purpose.  The only functions we really need are</div><div class='del'>-	  e_table_header_new and e_table_header_add_col.</div><div class='del'>-</div><div class='del'>-	  First we create the header.  */</div><div class='del'>-	e_table_header = e_table_header_new ();</div><div class='del'>-	</div><div class='del'>-	/* Next we have to build renderers for all of the columns.</div><div class='del'>-	   Since all our columns are text columns, we can simply use</div><div class='del'>-	   the same renderer over and over again.  If we had different</div><div class='del'>-	   types of columns, we could use a different renderer for</div><div class='del'>-	   each column. */</div><div class='del'>-	cell_left_just = e_cell_text_new (E_TABLE_MODEL(view-&gt;model), NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-		</div><div class='del'>-	/* Next we create a column object for each view column and add</div><div class='del'>-	   them to the header.  We don't create a column object for</div><div class='del'>-	   the importance column since it will not be shown. */</div><div class='del'>-	for (i = 0; i &lt; LAST_COL; i++){</div><div class='del'>-		/* Create the column. */</div><div class='del'>-		ETableCol *ecol = e_table_col_new (</div><div class='del'>-						   i, headers [i],</div><div class='del'>-						   80, 20, cell_left_just,</div><div class='del'>-						   g_str_compare, TRUE);</div><div class='del'>-		/* Add it to the header. */</div><div class='del'>-		e_table_header_add_column (e_table_header, ecol, i);</div><div class='del'>-	}</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'>-	e_table = e_table_new_from_spec_file (e_table_header, E_TABLE_MODEL(view-&gt;model), "spec");</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)-&gt;sort_info), "sort_info_changed",</div><div class='del'>-			   GTK_SIGNAL_FUNC(queue_header_save), e_table-&gt;sort_info);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)-&gt;header), "structure_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(queue_header_save), e_table-&gt;sort_info);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)-&gt;header), "dimension_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(queue_header_save), e_table-&gt;sort_info);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return e_table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-change_type(View *view, ViewType type)</div><div class='del'>-{</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	if (view-&gt;reflow)</div><div class='del'>-		destroy_reflow(view);</div><div class='del'>-	gtk_widget_destroy(view-&gt;child);</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VIEW_TYPE_REFLOW:</div><div class='del'>-		view-&gt;child = create_reflow(view);</div><div class='del'>-		break;</div><div class='del'>-	case VIEW_TYPE_TABLE:</div><div class='del'>-		view-&gt;child = create_table(view);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(view-&gt;frame), view-&gt;child);</div><div class='del'>-	gtk_widget_show_all(view-&gt;child);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-View *</div><div class='del'>-create_view(void)</div><div class='del'>-{</div><div class='del'>-	View *view = g_new(View, 1);</div><div class='del'>-	ViewType type = VIEW_TYPE_REFLOW;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-</div><div class='del'>-	view-&gt;reflow = NULL;</div><div class='del'>-</div><div class='del'>-	view-&gt;model = get_model(NULL);</div><div class='del'>-</div><div class='del'>-	/* This frame is simply to get a bevel around our table. */</div><div class='del'>-	view-&gt;frame = gtk_frame_new (NULL);</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VIEW_TYPE_REFLOW:</div><div class='del'>-		view-&gt;child = create_reflow(view);</div><div class='del'>-		break;</div><div class='del'>-	case VIEW_TYPE_TABLE:</div><div class='del'>-		view-&gt;child = create_table(view);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( view-&gt;child ), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-			    view );</div><div class='del'>-</div><div class='del'>-	/*	</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	button = gtk_button_new_with_label("Add address");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(add_address_cb), view);</div><div class='del'>-</div><div class='del'>-	change_button = gtk_button_new_with_label("Change View");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(change_button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(change_callback), view);</div><div class='del'>-	*/</div><div class='del'>-	/* Build the gtk widget hierarchy. */</div><div class='del'>-</div><div class='del'>-	view-&gt;widget = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	button = gtk_button_new_with_label("Add address");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(add_address_cb), view);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (view-&gt;frame), view-&gt;child);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (view-&gt;widget), view-&gt;frame, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (view-&gt;widget), button, FALSE, FALSE, 0);</div><div class='del'>-	/*</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), change_button, FALSE, FALSE, 0);</div><div class='del'>-	*/</div><div class='del'>-	/* Show it all. */</div><div class='del'>-	gtk_widget_show_all (view-&gt;widget);</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	gtk_object_sink(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	window_count ++;</div><div class='del'>-	return view;</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'>-change_callback(GtkWidget *button, View *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;type == VIEW_TYPE_REFLOW)</div><div class='del'>-		change_type(view, VIEW_TYPE_TABLE);</div><div class='del'>-	else</div><div class='del'>-		change_type(view, VIEW_TYPE_REFLOW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_window(char *filename, ViewType type)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GtkWidget *change_button;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	View *view = g_new(View, 1);</div><div class='del'>-</div><div class='del'>-	view-&gt;reflow = NULL;</div><div class='del'>-</div><div class='del'>-	view-&gt;model = get_model(filename);</div><div class='del'>-</div><div class='del'>-	/* Here we create a window for our new table.  This window</div><div class='del'>-	   will get shown and the person will be able to test their</div><div class='del'>-	   item. */</div><div class='del'>-	view-&gt;window = gtk_window_new (GTK_WINDOW_TOPLEVEL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( view-&gt;window ), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-			    view );</div><div class='del'>-</div><div class='del'>-	/* This frame is simply to get a bevel around our table. */</div><div class='del'>-	view-&gt;frame = gtk_frame_new (NULL);</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VIEW_TYPE_REFLOW:</div><div class='del'>-		view-&gt;child = create_reflow(view);</div><div class='del'>-		break;</div><div class='del'>-	case VIEW_TYPE_TABLE:</div><div class='del'>-		view-&gt;child = create_table(view);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	button = gtk_button_new_with_label("Add address");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(add_address_cb), view);</div><div class='del'>-</div><div class='del'>-	change_button = gtk_button_new_with_label("Change View");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(change_button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(change_callback), view);</div><div class='del'>-</div><div class='del'>-	/* Build the gtk widget hierarchy. */</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (view-&gt;frame), view-&gt;child);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), view-&gt;frame, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), change_button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (view-&gt;window), vbox);</div><div class='del'>-</div><div class='del'>-	/* Size the initial window. */</div><div class='del'>-	gtk_widget_set_usize (view-&gt;window, 200, 200);</div><div class='del'>-	/* Show it all. */</div><div class='del'>-	gtk_widget_show_all (view-&gt;window);</div><div class='del'>-	gtk_object_sink(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	window_count ++;</div><div class='del'>-	return view-&gt;window;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the main function which just initializes gnome and call our create_table function */</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 ("TableExample", "TableExample", argc, argv);</div><div class='del'>-	e_cursors_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'>-	create_window("addressbook.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_REFLOW);</div><div class='del'>-	create_window("addressbook2.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook2.xml", VIEW_TYPE_REFLOW);</div><div class='del'>-</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	e_cursors_shutdown ();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/addressbook/demo/addressbook-widget.h b/addressbook/demo/addressbook-widget.h<br/>deleted file mode 100644<br/>index 9111713da5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/addressbook-widget.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/addressbook-widget.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'>- * demo.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *</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, or (at your option)</div><div class='del'>- * 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'>-</div><div class='del'>-#ifndef __DEMO_H__</div><div class='del'>-#define __DEMO_H__</div><div class='del'>-</div><div class='del'>-#include "e-test-model.h"</div><div class='del'>-</div><div class='del'>-typedef struct _View View;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	VIEW_TYPE_REFLOW,</div><div class='del'>-	VIEW_TYPE_TABLE</div><div class='del'>-} ViewType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkAllocation last_alloc;</div><div class='del'>-	GnomeCanvasItem *reflow;</div><div class='del'>-	GtkWidget *canvas;</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	int model_changed_id;</div><div class='del'>-} Reflow;</div><div class='del'>-</div><div class='del'>-struct _View {</div><div class='del'>-	ViewType type;</div><div class='del'>-	ETestModel *model;</div><div class='del'>-	GtkWidget *child;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	Reflow *reflow;</div><div class='del'>-</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void change_type(View *view, ViewType type);</div><div class='del'>-View *create_view(void);</div><div class='del'>-</div><div class='del'>-#endif /* __DEMO_H__ */</div><div class='head'>diff --git a/addressbook/demo/addressbook.c b/addressbook/demo/addressbook.c<br/>deleted file mode 100644<br/>index 38cb6c7121..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/addressbook.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,199 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * folder-browser-factory.c: A Bonobo Control factory for Folder Browsers</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Miguel de Icaza (miguel@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * (C) 2000 Helix Code, Inc.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * bonobo-clock-control.c</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gtk-clock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook-widget.h"</div><div class='del'>-#include "addressbook.h"</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'>-bonobo_clock_control_prop_value_changed_cb (BonoboPropertyBag *pb, char *name, char *type,</div><div class='del'>-					    gpointer old_value, gpointer new_value,</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'>-	if (! strcmp (name, "running")) {</div><div class='del'>-		gboolean *b = new_value;</div><div class='del'>-</div><div class='del'>-		if (*b)</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'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Callback routine used to release any values we associated with the control</div><div class='del'>- * dynamically.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-release_data (GtkObject *object, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free (data);</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'>-control_deactivate (BonoboControl *control, BonoboUIHandler *uih)</div><div class='del'>-{</div><div class='del'>-	/* how to remove a menu item */</div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/Actions/New Contact"); </div><div class='del'>-</div><div class='del'>-	/* remove our toolbar */</div><div class='del'>-	bonobo_ui_handler_dock_remove (uih, "/Toolbar");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_nothing_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	printf ("Yow! I am called back!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo gnome_toolbar [] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("New"), N_("Create a new contact"), do_nothing_cb, GNOME_STOCK_PIXMAP_NEW),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Find"), N_("Find a contact"), do_nothing_cb, GNOME_STOCK_PIXMAP_SEARCH),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print contacts"), do_nothing_cb, GNOME_STOCK_PIXMAP_PRINT),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Delete"), N_("Delete a contact"), do_nothing_cb, GNOME_STOCK_PIXMAP_TRASH),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_END</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'>-control_activate (BonoboControl *control, BonoboUIHandler *uih)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIHandler  remote_uih;</div><div class='del'>-	GtkWidget *toolbar;</div><div class='del'>-	BonoboControl *toolbar_control;</div><div class='del'>-	</div><div class='del'>-	remote_uih = bonobo_control_get_remote_ui_handler (control);</div><div class='del'>-	bonobo_ui_handler_set_container (uih, remote_uih);		</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/Actions/New Contact", N_("_New Contact"),       </div><div class='del'>-					 NULL, -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, do_nothing_cb, NULL);</div><div class='del'>-</div><div class='del'>-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,</div><div class='del'>-				   GTK_TOOLBAR_BOTH);</div><div class='del'>-</div><div class='del'>-	gnome_app_fill_toolbar (GTK_TOOLBAR (toolbar),</div><div class='del'>-				gnome_toolbar, </div><div class='del'>-				NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show_all (toolbar);</div><div class='del'>-</div><div class='del'>-	toolbar_control = bonobo_control_new (toolbar);</div><div class='del'>-	bonobo_ui_handler_dock_add (</div><div class='del'>-		uih, "/Toolbar",</div><div class='del'>-		bonobo_object_corba_objref (BONOBO_OBJECT (toolbar_control)),</div><div class='del'>-		GNOME_DOCK_ITEM_BEH_LOCKED |</div><div class='del'>-		GNOME_DOCK_ITEM_BEH_EXCLUSIVE,</div><div class='del'>-		GNOME_DOCK_TOP,</div><div class='del'>-		1, 1, 0);</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'>-	BonoboUIHandler  *uih;</div><div class='del'>-</div><div class='del'>-	uih = bonobo_control_get_ui_handler (control);</div><div class='del'>-	g_assert (uih);</div><div class='del'>-	</div><div class='del'>-	if (activate)</div><div class='del'>-		control_activate (control, uih);</div><div class='del'>-	else</div><div class='del'>-		control_deactivate (control, uih);</div><div class='del'>-}</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'>-#if 0</div><div class='del'>-	BonoboPropertyBag  *pb;</div><div class='del'>-	CORBA_boolean	  *running;</div><div class='del'>-#endif</div><div class='del'>-	BonoboControl      *control;</div><div class='del'>-	View               *view;</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-	view = create_view();</div><div class='del'>-	control = bonobo_control_new (view-&gt;widget);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-			    control_activate_cb, NULL);	</div><div class='del'>-#if 0</div><div class='del'>-	/* Create the properties. */</div><div class='del'>-	pb = bonobo_property_bag_new ();</div><div class='del'>-	bonobo_control_set_property_bag (control, pb);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (pb), "value_changed",</div><div class='del'>-			    bonobo_clock_control_prop_value_changed_cb,</div><div class='del'>-			    clock);</div><div class='del'>-</div><div class='del'>-	running = g_new0 (CORBA_boolean, 1);</div><div class='del'>-	*running = TRUE;</div><div class='del'>-	bonobo_property_bag_add (pb, "running", "boolean",</div><div class='del'>-				(gpointer) running,</div><div class='del'>-				NULL, "Whether or not the clock is running", 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Release "running" when the object is destroyed</div><div class='del'>-	 */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (pb), "destroy", GTK_SIGNAL_FUNC (release_data), running);</div><div class='del'>-#endif</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'>-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 =</div><div class='del'>-		bonobo_generic_factory_new (</div><div class='del'>-			"control-factory:addressbook",</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='head'>diff --git a/addressbook/demo/addressbook.gnorba b/addressbook/demo/addressbook.gnorba<br/>deleted file mode 100644<br/>index 7114b1c332..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/addressbook.gnorba?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/addressbook.gnorba</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-[control-factory:addressbook]</div><div class='del'>-type=exe</div><div class='del'>-repo_id=IDL:GNOME/GenericFactory:1.0</div><div class='del'>-description=Factory for the sample Addressbook control</div><div class='del'>-location_info=evolution-addressbook</div><div class='del'>-</div><div class='del'>-[control:addressbook]</div><div class='del'>-type=factory</div><div class='del'>-repo_id=IDL:BonoboControl/addressbook-control:1.0 IDL:GNOME/Control:1.0</div><div class='del'>-description=A sample Bonobo control which displays an addressbook.</div><div class='del'>-location_info=control-factory:addressbook</div><div class='head'>diff --git a/addressbook/demo/addressbook.h b/addressbook/demo/addressbook.h<br/>deleted file mode 100644<br/>index e9289128a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/addressbook.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/addressbook.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +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'>-</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/demo/demo.c b/addressbook/demo/demo.c<br/>deleted file mode 100644<br/>index e6f7246b2f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/demo.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/demo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,466 +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;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gnome.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-util/e-cursors.h"</div><div class='del'>-#include "e-canvas.h"</div><div class='del'>-#include "e-table-simple.h"</div><div class='del'>-#include "e-table-header.h"</div><div class='del'>-#include "e-table-header-item.h"</div><div class='del'>-#include "e-table-item.h"</div><div class='del'>-#include "e-cell-text.h"</div><div class='del'>-#include "e-cell-checkbox.h"</div><div class='del'>-#include "e-table.h"</div><div class='del'>-#include "e-reflow.h"</div><div class='del'>-#include "e-minicard.h"</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 "table-test.h"</div><div class='del'>-</div><div class='del'>-#include "e-test-model.h"</div><div class='del'>-</div><div class='del'>-#define COLS 4</div><div class='del'>-</div><div class='del'>-/* Here we define the initial layout of the table.  This is an xml</div><div class='del'>-   format that allows you to change the initial ordering of the</div><div class='del'>-   columns or to do sorting or grouping initially.  This specification</div><div class='del'>-   shows all 5 columns, but moves the importance column nearer to the</div><div class='del'>-   front.  It also sorts by the "Full Name" column (ascending.)</div><div class='del'>-   Sorting and grouping take the model column as their arguments</div><div class='del'>-   (sorting is specified by the "column" argument to the leaf elemnt. */</div><div class='del'>-#define INITIAL_SPEC "&lt;ETableSpecification&gt;                    	       \</div><div class='del'>-	&lt;columns-shown&gt;                  			       \</div><div class='del'>-		&lt;column&gt; 0 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 1 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 2 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 3 &lt;/column&gt;     			       \</div><div class='del'>-	&lt;/columns-shown&gt;                 			       \</div><div class='del'>-	&lt;grouping&gt; &lt;leaf column=\"1\" ascending=\"1\"/&gt; &lt;/grouping&gt;    \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-char *headers[COLS] = {</div><div class='del'>-  "Email",</div><div class='del'>-  "Full Name",</div><div class='del'>-  "Address",</div><div class='del'>-  "Phone"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _View View;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	VIEW_TYPE_REFLOW,</div><div class='del'>-	VIEW_TYPE_TABLE</div><div class='del'>-} ViewType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkAllocation last_alloc;</div><div class='del'>-	GnomeCanvasItem *reflow;</div><div class='del'>-	GtkWidget *canvas;</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	int model_changed_id;</div><div class='del'>-} Reflow;</div><div class='del'>-</div><div class='del'>-struct _View {</div><div class='del'>-	ETestModel *model;</div><div class='del'>-	GtkWidget *window;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *child;</div><div class='del'>-</div><div class='del'>-	ViewType type;</div><div class='del'>-</div><div class='del'>-	Reflow *reflow;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int window_count = 0;</div><div class='del'>-static GHashTable *models = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_model(ETableModel *model, gchar *filename)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_remove(models, filename);</div><div class='del'>-	g_free(filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ETestModel *</div><div class='del'>-get_model(char *filename)</div><div class='del'>-{</div><div class='del'>-	ETestModel *model;</div><div class='del'>-	if ( models == NULL ) {</div><div class='del'>-		models = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model = g_hash_table_lookup(models, filename);</div><div class='del'>-	if ( model )</div><div class='del'>-		return model;</div><div class='del'>-</div><div class='del'>-	filename = g_strdup(filename);</div><div class='del'>-	</div><div class='del'>-	model = E_TEST_MODEL(e_test_model_new(filename));</div><div class='del'>-	g_hash_table_insert(models,</div><div class='del'>-			    filename, model);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(model), "destroy",</div><div class='del'>-			   GTK_SIGNAL_FUNC(remove_model), filename);</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_address_cb(GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	View *view = (View *) data;</div><div class='del'>-	Address *newadd = g_new(Address, 1);</div><div class='del'>-	newadd-&gt;email = g_strdup("");</div><div class='del'>-	newadd-&gt;phone = g_strdup("");</div><div class='del'>-	newadd-&gt;full_name = g_strdup("");</div><div class='del'>-	newadd-&gt;street = g_strdup("");</div><div class='del'>-	e_test_model_add_column (view-&gt;model, newadd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rebuild_reflow(ETableModel *model, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	View *view = (View *) data;</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if (!reflow)</div><div class='del'>-		return;</div><div class='del'>-	gtk_object_destroy(GTK_OBJECT(reflow-&gt;reflow));</div><div class='del'>-	reflow-&gt;reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( reflow-&gt;canvas ) ),</div><div class='del'>-					      e_reflow_get_type(),</div><div class='del'>-					      "x", (double) 0,</div><div class='del'>-					      "y", (double) 0,</div><div class='del'>-					      "height", (double) reflow-&gt;last_alloc.height,</div><div class='del'>-					      "minimum_width", (double) reflow-&gt;last_alloc.width,</div><div class='del'>-					      NULL );</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; view-&gt;model-&gt;data_count; i++ )</div><div class='del'>-		{</div><div class='del'>-			GnomeCanvasItem *item;</div><div class='del'>-			item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow-&gt;reflow),</div><div class='del'>-						      e_minicard_get_type(),</div><div class='del'>-						      "model", view-&gt;model,</div><div class='del'>-						      "row", i,</div><div class='del'>-						      NULL);</div><div class='del'>-			e_reflow_add_item(E_REFLOW(reflow-&gt;reflow), item);</div><div class='del'>-		}</div><div class='del'>-	e_canvas_item_request_reflow(reflow-&gt;reflow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_reflow(View *view)</div><div class='del'>-{</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if ( !reflow )</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT(view-&gt;model),</div><div class='del'>-			      reflow-&gt;model_changed_id);</div><div class='del'>-	g_free(reflow);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	view-&gt;reflow = NULL;</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'>-	View *view = (View *)data;</div><div class='del'>-	if ( view-&gt;reflow ) {</div><div class='del'>-		destroy_reflow(view);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	g_free(view);</div><div class='del'>-	window_count --;</div><div class='del'>-	if ( window_count &lt;= 0 )</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'>-	View *view = (View *)data;</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if ( !reflow )</div><div class='del'>-		return;</div><div class='del'>-	reflow-&gt;last_alloc = *allocation;</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;reflow,</div><div class='del'>-			       "height", (double) allocation-&gt;height,</div><div class='del'>-			       NULL );</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;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-&gt;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( reflow-&gt;canvas ), 0, 0, width, allocation-&gt;height );</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;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(ECanvas *canvas, gpointer data)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	View *view = (View *)data;</div><div class='del'>-	Reflow *reflow = view-&gt;reflow;</div><div class='del'>-	if ( !reflow )</div><div class='del'>-		return;</div><div class='del'>-  	gtk_object_get(GTK_OBJECT(reflow-&gt;reflow),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, reflow-&gt;last_alloc.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS(reflow-&gt;canvas), 0, 0, width, reflow-&gt;last_alloc.height );</div><div class='del'>-	gnome_canvas_item_set( reflow-&gt;rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) reflow-&gt;last_alloc.height,</div><div class='del'>-			       NULL );	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_reflow(View *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *inner_vbox;</div><div class='del'>-	GtkWidget *scrollbar;</div><div class='del'>-	int i;</div><div class='del'>-	Reflow *reflow = g_new(Reflow, 1);</div><div class='del'>-	view-&gt;reflow = reflow;</div><div class='del'>-</div><div class='del'>-	view-&gt;type = VIEW_TYPE_REFLOW;</div><div class='del'>-</div><div class='del'>-	/* Next we create our model.  This uses the functions we defined</div><div class='del'>-	   earlier. */</div><div class='del'>-</div><div class='del'>-	inner_vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	reflow-&gt;canvas = e_canvas_new();</div><div class='del'>-	reflow-&gt;rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( reflow-&gt;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-&gt;reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( reflow-&gt;canvas ) ),</div><div class='del'>-					      e_reflow_get_type(),</div><div class='del'>-					      "x", (double) 0,</div><div class='del'>-					      "y", (double) 0,</div><div class='del'>-					      "height", (double) 100,</div><div class='del'>-					      "minimum_width", (double) 100,</div><div class='del'>-					      NULL );</div><div class='del'>-	/* Connect the signals */</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( reflow-&gt;canvas ), "reflow",</div><div class='del'>-			    GTK_SIGNAL_FUNC( resize ),</div><div class='del'>-			    ( gpointer ) view);</div><div class='del'>-	</div><div class='del'>-	for ( i = 0; i &lt; view-&gt;model-&gt;data_count; i++ )</div><div class='del'>-		{</div><div class='del'>-			GnomeCanvasItem *item;</div><div class='del'>-			item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow-&gt;reflow),</div><div class='del'>-						      e_minicard_get_type(),</div><div class='del'>-						      "model", view-&gt;model,</div><div class='del'>-						      "row", i,</div><div class='del'>-						      NULL);</div><div class='del'>-			e_reflow_add_item(E_REFLOW(reflow-&gt;reflow), item);</div><div class='del'>-		}</div><div class='del'>-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( reflow-&gt;canvas ),</div><div class='del'>-					 0, 0,</div><div class='del'>-					 100, 100 );</div><div class='del'>-</div><div class='del'>-	scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(reflow-&gt;canvas)));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( reflow-&gt;canvas ), "size_allocate",</div><div class='del'>-			    GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-			    ( gpointer ) view );</div><div class='del'>-</div><div class='del'>-	gdk_window_set_back_pixmap( GTK_LAYOUT(reflow-&gt;canvas)-&gt;bin_window, NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	reflow-&gt;model_changed_id = gtk_signal_connect(GTK_OBJECT( view-&gt;model ), "model_changed",</div><div class='del'>-						      GTK_SIGNAL_FUNC(rebuild_reflow), view);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-</div><div class='del'>-	/* Build the gtk widget hierarchy. */</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(inner_vbox), reflow-&gt;canvas, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(inner_vbox), scrollbar, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	return inner_vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We create a window containing our new table. */</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_table(View *view)</div><div class='del'>-{</div><div class='del'>-	ECell *cell_left_just;</div><div class='del'>-	ETableHeader *e_table_header;</div><div class='del'>-	GtkWidget *e_table;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	view-&gt;type = VIEW_TYPE_TABLE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	  Next we create a header.  The ETableHeader is used in two</div><div class='del'>-	  different way.  The first is the full_header.  This is the</div><div class='del'>-	  list of possible columns in the view.  The second use is</div><div class='del'>-	  completely internal.  Many of the ETableHeader functions are</div><div class='del'>-	  for that purpose.  The only functions we really need are</div><div class='del'>-	  e_table_header_new and e_table_header_add_col.</div><div class='del'>-</div><div class='del'>-	  First we create the header.  */</div><div class='del'>-	e_table_header = e_table_header_new ();</div><div class='del'>-	</div><div class='del'>-	/* Next we have to build renderers for all of the columns.</div><div class='del'>-	   Since all our columns are text columns, we can simply use</div><div class='del'>-	   the same renderer over and over again.  If we had different</div><div class='del'>-	   types of columns, we could use a different renderer for</div><div class='del'>-	   each column. */</div><div class='del'>-	cell_left_just = e_cell_text_new (E_TABLE_MODEL(view-&gt;model), NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-		</div><div class='del'>-	/* Next we create a column object for each view column and add</div><div class='del'>-	   them to the header.  We don't create a column object for</div><div class='del'>-	   the importance column since it will not be shown. */</div><div class='del'>-	for (i = 0; i &lt; LAST_COL; i++){</div><div class='del'>-		/* Create the column. */</div><div class='del'>-		ETableCol *ecol = e_table_col_new (</div><div class='del'>-						   i, headers [i],</div><div class='del'>-						   80, 20, cell_left_just,</div><div class='del'>-						   g_str_compare, TRUE);</div><div class='del'>-		/* Add it to the header. */</div><div class='del'>-		e_table_header_add_column (e_table_header, ecol, i);</div><div class='del'>-	}</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'>-	e_table = e_table_new_from_spec_file (e_table_header, E_TABLE_MODEL(view-&gt;model), "spec");</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)-&gt;sort_info), "sort_info_changed",</div><div class='del'>-			   GTK_SIGNAL_FUNC(queue_header_save), e_table-&gt;sort_info);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)-&gt;header), "structure_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(queue_header_save), e_table-&gt;sort_info);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_TABLE(e_table)-&gt;header), "dimension_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(queue_header_save), e_table-&gt;sort_info);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return e_table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_type(View *view, ViewType type)</div><div class='del'>-{</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	if (view-&gt;reflow)</div><div class='del'>-		destroy_reflow(view);</div><div class='del'>-	gtk_widget_destroy(view-&gt;child);</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VIEW_TYPE_REFLOW:</div><div class='del'>-		view-&gt;child = create_reflow(view);</div><div class='del'>-		break;</div><div class='del'>-	case VIEW_TYPE_TABLE:</div><div class='del'>-		view-&gt;child = create_table(view);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(view-&gt;frame), view-&gt;child);</div><div class='del'>-	gtk_widget_show_all(view-&gt;child);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_callback(GtkWidget *button, View *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;type == VIEW_TYPE_REFLOW)</div><div class='del'>-		change_type(view, VIEW_TYPE_TABLE);</div><div class='del'>-	else</div><div class='del'>-		change_type(view, VIEW_TYPE_REFLOW);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_window(char *filename, ViewType type)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GtkWidget *change_button;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	View *view = g_new(View, 1);</div><div class='del'>-</div><div class='del'>-	view-&gt;reflow = NULL;</div><div class='del'>-</div><div class='del'>-	view-&gt;model = get_model(filename);</div><div class='del'>-</div><div class='del'>-	/* Here we create a window for our new table.  This window</div><div class='del'>-	   will get shown and the person will be able to test their</div><div class='del'>-	   item. */</div><div class='del'>-	view-&gt;window = gtk_window_new (GTK_WINDOW_TOPLEVEL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( view-&gt;window ), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-			    view );</div><div class='del'>-</div><div class='del'>-	/* This frame is simply to get a bevel around our table. */</div><div class='del'>-	view-&gt;frame = gtk_frame_new (NULL);</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VIEW_TYPE_REFLOW:</div><div class='del'>-		view-&gt;child = create_reflow(view);</div><div class='del'>-		break;</div><div class='del'>-	case VIEW_TYPE_TABLE:</div><div class='del'>-		view-&gt;child = create_table(view);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	button = gtk_button_new_with_label("Add address");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(add_address_cb), view);</div><div class='del'>-</div><div class='del'>-	change_button = gtk_button_new_with_label("Change View");</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(change_button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(change_callback), view);</div><div class='del'>-</div><div class='del'>-	/* Build the gtk widget hierarchy. */</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (view-&gt;frame), view-&gt;child);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), view-&gt;frame, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), change_button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (view-&gt;window), vbox);</div><div class='del'>-</div><div class='del'>-	/* Size the initial window. */</div><div class='del'>-	gtk_widget_set_usize (view-&gt;window, 200, 200);</div><div class='del'>-	/* Show it all. */</div><div class='del'>-	gtk_widget_show_all (view-&gt;window);</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	gtk_object_sink(GTK_OBJECT(view-&gt;model));</div><div class='del'>-	window_count ++;</div><div class='del'>-	return view-&gt;window;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the main function which just initializes gnome and call our create_table function */</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 ("TableExample", "TableExample", argc, argv);</div><div class='del'>-	e_cursors_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'>-	create_window("addressbook.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_REFLOW);</div><div class='del'>-	create_window("addressbook.xml", VIEW_TYPE_REFLOW);</div><div class='del'>-	create_window("addressbook2.xml", VIEW_TYPE_TABLE);</div><div class='del'>-	create_window("addressbook2.xml", VIEW_TYPE_REFLOW);</div><div class='del'>-</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	e_cursors_shutdown ();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/demo/e-test-model.c b/addressbook/demo/e-test-model.c<br/>deleted file mode 100644<br/>index 941e1c006f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/e-test-model.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/e-test-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,385 +0,0 @@</div><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'>- *   Miguel de Icaza (miguel@gnu.org)</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Helix Code, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-test-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'>-</div><div class='del'>-#define PARENT_TYPE e_table_model_get_type()</div><div class='del'>-/*</div><div class='del'>- * ETestModel callbacks</div><div class='del'>-n * These are the callbacks that define the behavior of our custom model.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_destroy(GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ETestModel *model = E_TEST_MODEL(object);</div><div class='del'>-	int i;</div><div class='del'>-	if (model-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book));</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'>-	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'>-	g_free(model-&gt;uri);</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'>-test_col_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	return LAST_COL;</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'>-test_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	ETestModel *test = E_TEST_MODEL(etc);</div><div class='del'>-	return test-&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'>-test_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	ETestModel *test = E_TEST_MODEL(etc);</div><div class='del'>-	ECardList *list;</div><div class='del'>-	ECardIterator *iterator;</div><div class='del'>-	gchar *string;</div><div class='del'>-	if ( col &gt;= LAST_COL || row &gt;= test-&gt;data_count )</div><div class='del'>-		return NULL;</div><div class='del'>-	switch (col) {</div><div class='del'>-	case EMAIL:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "email", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		iterator = e_card_list_get_iterator(list);</div><div class='del'>-		if (e_card_iterator_get(iterator))</div><div class='del'>-			return (void *) e_card_iterator_get(iterator);</div><div class='del'>-		else</div><div class='del'>-			return "";</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</div><div class='del'>-	case FULL_NAME:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "full_name", &amp;string,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (string)</div><div class='del'>-			return string;</div><div class='del'>-		else</div><div class='del'>-			return "";</div><div class='del'>-		break;</div><div class='del'>-	case STREET:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "street", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		iterator = e_card_list_get_iterator(list);</div><div class='del'>-		if (e_card_iterator_get(iterator))</div><div class='del'>-			return ((ECardDeliveryAddress *)e_card_iterator_get(iterator))-&gt;street;</div><div class='del'>-		else</div><div class='del'>-			return "";</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</div><div class='del'>-	case PHONE:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "phone", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		iterator = e_card_list_get_iterator(list);</div><div class='del'>-		if (e_card_iterator_get(iterator))</div><div class='del'>-			return ((ECardPhone *)e_card_iterator_get(iterator))-&gt;number;</div><div class='del'>-		else</div><div class='del'>-			return "";</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</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'>-/* This function sets the value at a particular point in our ETableModel. */</div><div class='del'>-static void</div><div class='del'>-test_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	ETestModel *test = E_TEST_MODEL(etc);</div><div class='del'>-	ECardList *list;</div><div class='del'>-	ECardIterator *iterator;</div><div class='del'>-	if ( col &gt;= LAST_COL || row &gt;= test-&gt;data_count )</div><div class='del'>-		return;</div><div class='del'>-	switch (col) {</div><div class='del'>-	case EMAIL:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "email", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		iterator = e_card_list_get_iterator(list);</div><div class='del'>-		if (e_card_iterator_is_valid(iterator)) {</div><div class='del'>-			e_card_iterator_set(iterator, val);</div><div class='del'>-		} else {</div><div class='del'>-			e_card_list_append(list, val);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</div><div class='del'>-	case FULL_NAME:</div><div class='del'>-		gtk_object_set(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "full_name", val,</div><div class='del'>-			       NULL);</div><div class='del'>-		break;</div><div class='del'>-	case STREET:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "address", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		iterator = e_card_list_get_iterator(list);</div><div class='del'>-		if (e_card_iterator_is_valid(iterator)) {</div><div class='del'>-			const ECardDeliveryAddress *address = e_card_iterator_get(iterator);</div><div class='del'>-			ECardDeliveryAddress *address_copy = e_card_delivery_address_copy(address);</div><div class='del'>-			g_free(address_copy-&gt;street);</div><div class='del'>-			address_copy-&gt;street = g_strdup(val);</div><div class='del'>-			e_card_iterator_set(iterator, address_copy);</div><div class='del'>-			e_card_delivery_address_free(address_copy);</div><div class='del'>-		} else {</div><div class='del'>-			ECardDeliveryAddress *address = g_new(ECardDeliveryAddress, 1);</div><div class='del'>-			address-&gt;po = NULL;</div><div class='del'>-			address-&gt;ext = NULL;</div><div class='del'>-			address-&gt;street = g_strdup(val);</div><div class='del'>-			address-&gt;city = NULL;</div><div class='del'>-			address-&gt;region = NULL;</div><div class='del'>-			address-&gt;code = NULL;</div><div class='del'>-			address-&gt;country = NULL;</div><div class='del'>-			address-&gt;flags = 0;</div><div class='del'>-			e_card_list_append(list, address);</div><div class='del'>-			e_card_delivery_address_free(address);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</div><div class='del'>-	case PHONE:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(test-&gt;data[row]),</div><div class='del'>-			       "phone", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		iterator = e_card_list_get_iterator(list);</div><div class='del'>-		if (e_card_iterator_is_valid(iterator)) {</div><div class='del'>-			const ECardPhone *phone = e_card_iterator_get(iterator);</div><div class='del'>-			ECardPhone *phone_copy = e_card_phone_copy(phone);</div><div class='del'>-			g_free(phone_copy-&gt;number);</div><div class='del'>-			phone_copy-&gt;number = g_strdup(val);</div><div class='del'>-			e_card_iterator_set(iterator, phone_copy);</div><div class='del'>-			e_card_phone_free(phone_copy);</div><div class='del'>-		} else {</div><div class='del'>-			ECardPhone *phone = g_new(ECardPhone, 1);</div><div class='del'>-			phone-&gt;number = g_strdup(val);</div><div class='del'>-			phone-&gt;flags = 0;</div><div class='del'>-			e_card_list_append(list, phone);</div><div class='del'>-			e_card_phone_free(phone);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	e_book_commit_card(test-&gt;book, test-&gt;data[row], NULL, NULL);</div><div class='del'>-	if ( !etc-&gt;frozen )</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'>-test_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'>-test_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'>-test_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'>-/* This function is for when the model is unfrozen.  This can mostly</div><div class='del'>-   be ignored for simple models.  */</div><div class='del'>-static void</div><div class='del'>-test_thaw (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	e_table_model_changed(etc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_test_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 = test_destroy;</div><div class='del'>-</div><div class='del'>-	model_class-&gt;column_count = test_col_count;</div><div class='del'>-	model_class-&gt;row_count = test_row_count;</div><div class='del'>-	model_class-&gt;value_at = test_value_at;</div><div class='del'>-	model_class-&gt;set_value_at = test_set_value_at;</div><div class='del'>-	model_class-&gt;is_cell_editable = test_is_cell_editable;</div><div class='del'>-	model_class-&gt;duplicate_value = test_duplicate_value;</div><div class='del'>-	model_class-&gt;free_value = test_free_value;</div><div class='del'>-	model_class-&gt;thaw = test_thaw;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_test_model_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ETestModel *model = E_TEST_MODEL(object);</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	model-&gt;book = NULL;</div><div class='del'>-	model-&gt;book_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_test_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'>-			"ETestModel",</div><div class='del'>-			sizeof (ETestModel),</div><div class='del'>-			sizeof (ETestModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_test_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_test_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_test_model_add_column (ETestModel *model, Address *newadd)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	model-&gt;data = g_realloc(model-&gt;data, (++model-&gt;data_count) * sizeof(Address *));</div><div class='del'>-	model-&gt;data[model-&gt;data_count - 1] = newadd;</div><div class='del'>-	e_test_model_queue_save(model);</div><div class='del'>-	if ( model &amp;&amp; !E_TABLE_MODEL(model)-&gt;frozen )</div><div class='del'>-		e_table_model_changed(E_TABLE_MODEL(model));</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_test_model_card_added(EBookView *book_view,</div><div class='del'>-			const GList *cards,</div><div class='del'>-			ETestModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;data = g_realloc(model-&gt;data, (model-&gt;data_count + g_list_length((GList *)cards)) * sizeof(ECard *));</div><div class='del'>-	for ( ; cards; cards = cards-&gt;next) {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(cards-&gt;data));</div><div class='del'>-		model-&gt;data[model-&gt;data_count++] = E_CARD (cards-&gt;data);</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'>-static void</div><div class='del'>-e_test_model_card_removed(EBookView *book_view,</div><div class='del'>-			  const char *id,</div><div class='del'>-			  ETestModel *model)</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_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'>-		}</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'>-static void</div><div class='del'>-e_test_model_card_changed(EBookView *book_view,</div><div class='del'>-			  const GList *cards,</div><div class='del'>-			  ETestModel *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(cards-&gt;data);</div><div class='del'>-				gtk_object_ref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-				e_table_model_row_changed(E_TABLE_MODEL(model), 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'>-e_test_model_book_respond_get_view(EBook *book,</div><div class='del'>-				   EBookStatus status,</div><div class='del'>-				   EBookView *book_view,</div><div class='del'>-				   ETestModel *model)</div><div class='del'>-{</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		model-&gt;book_view = book_view;</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(book_view));</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(book_view),</div><div class='del'>-				   "card_changed",</div><div class='del'>-				   GTK_SIGNAL_FUNC(e_test_model_card_changed),</div><div class='del'>-				   model);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(book_view),</div><div class='del'>-				   "card_removed",</div><div class='del'>-				   GTK_SIGNAL_FUNC(e_test_model_card_removed),</div><div class='del'>-				   model);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(book_view),</div><div class='del'>-				   "card_added",</div><div class='del'>-				   GTK_SIGNAL_FUNC(e_test_model_card_added),</div><div class='del'>-				   model);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_test_model_uri_loaded(EBook *book,</div><div class='del'>-			EBookStatus status,</div><div class='del'>-			ETestModel *model)</div><div class='del'>-{</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_book_get_book_view (book,</div><div class='del'>-				      "",</div><div class='del'>-				      (EBookBookViewCallback) e_test_model_book_respond_get_view,</div><div class='del'>-				      model);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETableModel *</div><div class='del'>-e_test_model_new (gchar *uri)</div><div class='del'>-{</div><div class='del'>-	ETestModel *et;</div><div class='del'>-</div><div class='del'>-	et = gtk_type_new (e_test_model_get_type ());</div><div class='del'>-	</div><div class='del'>-	et-&gt;uri = g_strdup(uri);</div><div class='del'>-	et-&gt;book = e_book_new();</div><div class='del'>-	e_book_load_uri(et-&gt;book,</div><div class='del'>-			et-&gt;uri,</div><div class='del'>-			(EBookCallback) e_test_model_uri_loaded,</div><div class='del'>-			et);</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/demo/e-test-model.h b/addressbook/demo/e-test-model.h<br/>deleted file mode 100644<br/>index 871ea11de8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/e-test-model.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/e-test-model.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'>-#ifndef _E_TEST_MODEL_H_</div><div class='del'>-#define _E_TEST_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include "e-table-model.h"</div><div class='del'>-#include &lt;e-book.h&gt;</div><div class='del'>-#include &lt;e-book-view.h&gt;</div><div class='del'>-#include &lt;e-card.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TEST_MODEL_TYPE        (e_test_model_get_type ())</div><div class='del'>-#define E_TEST_MODEL(o)          (GTK_CHECK_CAST ((o), E_TEST_MODEL_TYPE, ETestModel))</div><div class='del'>-#define E_TEST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TEST_MODEL_TYPE, ETestModelClass))</div><div class='del'>-#define E_IS_TEST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TEST_MODEL_TYPE))</div><div class='del'>-#define E_IS_TEST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TEST_MODEL_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'>-typedef struct _Address Address;</div><div class='del'>-typedef enum _Rows Rows;</div><div class='del'>-</div><div class='del'>-struct _Address {</div><div class='del'>-	gchar *email;</div><div class='del'>-	gchar *full_name;</div><div class='del'>-	gchar *street;</div><div class='del'>-	gchar *phone;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _Rows {</div><div class='del'>-	EMAIL,</div><div class='del'>-	FULL_NAME,</div><div class='del'>-	STREET,</div><div class='del'>-	PHONE,</div><div class='del'>-	LAST_COL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	EBookView *book_view;</div><div class='del'>-</div><div class='del'>-	ECard **data;</div><div class='del'>-	int data_count;</div><div class='del'>-</div><div class='del'>-	char *uri;</div><div class='del'>-} ETestModel;</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'>-} ETestModelClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_test_model_get_type (void);</div><div class='del'>-ETableModel *e_test_model_new (char *uri);</div><div class='del'>-</div><div class='del'>-void e_test_model_add_column (ETestModel *model, Address *newadd);</div><div class='del'>-</div><div class='del'>-#endif /* _E_TEST_MODEL_H_ */</div><div class='head'>diff --git a/addressbook/demo/spec b/addressbook/demo/spec<br/>deleted file mode 100644<br/>index 2d366ed75f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/demo/spec?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/demo/spec</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;ETableSpecification&gt;</div><div class='del'>-  &lt;columns-shown&gt;</div><div class='del'>-    &lt;column&gt;1&lt;/column&gt;</div><div class='del'>-    &lt;column&gt;0&lt;/column&gt;</div><div class='del'>-    &lt;column&gt;2&lt;/column&gt;</div><div class='del'>-    &lt;column&gt;3&lt;/column&gt;</div><div class='del'>-  &lt;/columns-shown&gt;</div><div class='del'>-  &lt;grouping&gt;</div><div class='del'>-    &lt;leaf column="2" ascending="1"/&gt;</div><div class='del'>-  &lt;/grouping&gt;</div><div class='del'>-&lt;/ETableSpecification&gt;</div><div class='head'>diff --git a/addressbook/ename/.cvsignore b/addressbook/ename/.cvsignore<br/>deleted file mode 100644<br/>index 4f8c173841..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/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/addressbook/ename/Makefile.am b/addressbook/ename/Makefile.am<br/>deleted file mode 100644<br/>index e30796574a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/ename/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \</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'>-        $(GNOME_INCLUDEDIR)</div><div class='del'>-</div><div class='del'>-gnome_libs =						\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(INTLLIBS)</div><div class='del'>-</div><div class='del'>-ename_libs = 						\</div><div class='del'>-	libename.la 					\</div><div class='del'>-	$(gnome_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-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-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_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 = $(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 = $(ename_libs) $(gnome_libs)</div><div class='head'>diff --git a/addressbook/ename/TODO b/addressbook/ename/TODO<br/>deleted file mode 100644<br/>index 669661eea7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/TODO?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/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/addressbook/ename/e-name-western-tables.h b/addressbook/ename/e-name-western-tables.h<br/>deleted file mode 100644<br/>index 369d530edc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/e-name-western-tables.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/ename/e-name-western-tables.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +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'>-	"reverend", "president", "judge", "senator",</div><div class='del'>-	"congressman", "congresswoman",</div><div class='del'>-</div><div class='del'>-	"the honorable", "the reverend", "his holiness",</div><div class='del'>-	"his eminence",</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * French.</div><div class='del'>-	 */</div><div class='del'>-	"monsieur", "mr.", "mademoiselle", "melle.",</div><div class='del'>-	"madame", "mme.", "professeur",</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Spanish.</div><div class='del'>-	 */</div><div class='del'>-	"senor", "senora", "senorita",</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'>-	"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/addressbook/ename/e-name-western.c b/addressbook/ename/e-name-western.c<br/>deleted file mode 100644<br/>index 698cceec0b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/e-name-western.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/ename/e-name-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,868 +0,0 @@</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'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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'>-		if (g_strcasecmp (word, e_name_western_sfx_table [i]))</div><div class='del'>-			continue;</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'>-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; isalpha (word [0]) &amp;&amp; isalpha (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'>-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'>-	/*</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/addressbook/ename/e-name-western.h b/addressbook/ename/e-name-western.h<br/>deleted file mode 100644<br/>index fa5bac494c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/e-name-western.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/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/addressbook/ename/test-ename-western-gtk.c b/addressbook/ename/test-ename-western-gtk.c<br/>deleted file mode 100644<br/>index 17daf42b30..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/test-ename-western-gtk.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/ename/test-ename-western-gtk.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;ename/e-name-western.h&gt;</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) (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'>-	e_name_western_free (name);</div><div class='del'>-	name = e_name_western_parse (gtk_entry_get_text (fulle));</div><div class='del'>-	fill_entries ();</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/addressbook/ename/test-ename-western.c b/addressbook/ename/test-ename-western.c<br/>deleted file mode 100644<br/>index 6d3beaf16f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ename/test-ename-western.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/ename/test-ename-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 50c258b544..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = minicard component
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore<br/>deleted file mode 100644<br/>index a8ecb5d170..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/.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'>-.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='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 15820b2e03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"</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 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:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"&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:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"</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 Evolution addressbook component."/&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:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo<br/>deleted file mode 100644<br/>index 15820b2e03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"</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 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:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"&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:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"</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 Evolution addressbook component."/&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:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"&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/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_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 ade764904b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-CPPFLAGS =					\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)				\</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/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	$(BONOBO_HTML_GNOME_CFLAGS)			\</div><div class='del'>-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"</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'>-	e-ldap-server-dialog.c          \</div><div class='del'>-	e-ldap-server-dialog.h		\</div><div class='del'>-	e-addressbook-model.c		\</div><div class='del'>-	e-addressbook-model.h		\</div><div class='del'>-	e-cardlist-model.c		\</div><div class='del'>-	e-cardlist-model.h		\</div><div class='del'>-	e-select-names.c		\</div><div class='del'>-	e-select-names.h		\</div><div class='del'>-	addressbook-component.c		\</div><div class='del'>-	addressbook-component.h		\</div><div class='del'>-	addressbook-factory.c		\</div><div class='del'>-	addressbook.c			\</div><div class='del'>-	addressbook.h</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDADD =						\</div><div class='del'>-	$(top_builddir)/shell/libeshell.a				\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(BONOBO_HTML_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/addressbook/gui/minicard/libeminicard.a		\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.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)/libversit/libversit.la				\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a			\</div><div class='del'>-	$(top_builddir)/widgets/e-table/libetable.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/printing/libecontactprint.a</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf`</div><div class='del'>-</div><div class='del'>-if USING_OAF</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = addressbook.oafinfo</div><div class='del'>-else</div><div class='del'>-gnorbadir = $(sysconfdir)/CORBA/servers</div><div class='del'>-gnorba_DATA = addressbook.gnorba</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade select-names.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	addressbook.gnorba	\</div><div class='del'>-	addressbook.oafinfo	\</div><div class='del'>-	alphabet.glade.h	\</div><div class='del'>-	select-names.glade.h</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 793e168c18..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-component.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook-component.c</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'>-/* addressbook-component.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Helix Code, 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 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: 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.h&gt;</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'>-#include "addressbook-component.h"</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"</div><div class='del'>-#else</div><div class='del'>-#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:addressbook"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ "contacts", "evolution-contacts.png" },</div><div class='del'>-	{ NULL, NULL }</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'>-	     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, "contacts") != 0)</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 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'>-	      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'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_unset_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-		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'>-		gtk_main_quit();</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 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'>-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL);</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'>-</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'>-</div><div class='del'>-void</div><div class='del'>-addressbook_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_ID, factory_fn, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("Cannot initialize the Evolution addressbook factory.");</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 ec37da694a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-component.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook-component.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'>-/* addressbook-component.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Helix Code, 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 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: 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'>-void  addressbook_component_factory_init  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _ADDRESSBOOK_COMPONENT_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 f16c321b68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-factory.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/**</div><div class='del'>- * sample-control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;e-util/e-cursors.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "addressbook-component.h"</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</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'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</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'>-	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_CORBA_init_with_popt_table (</div><div class='del'>-		"evolution-addressbook", "0.0",</div><div class='del'>-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &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'>-#endif</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'>-	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'>-	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'>-	/* 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_cursors_init();</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.c b/addressbook/gui/component/addressbook.c<br/>deleted file mode 100644<br/>index 1bce1010e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1144 +0,0 @@</div><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@helixcode.com)</div><div class='del'>- *</div><div class='del'>- * (C) 2000 Helix Code, 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;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-popup-menu.h&gt;</div><div class='del'>-#include "e-minicard-view.h"</div><div class='del'>-</div><div class='del'>-#include &lt;e-table.h&gt;</div><div class='del'>-#include &lt;e-cell-text.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-addressbook-model.h&gt;</div><div class='del'>-#include &lt;e-select-names.h&gt;</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-ldap-server-dialog.h"</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 &lt;addressbook/printing/e-contact-print.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#define CONTROL_FACTORY_ID "OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"</div><div class='del'>-#else</div><div class='del'>-#define CONTROL_FACTORY_ID "control-factory:addressbook"</div><div class='del'>-#endif</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 enum {</div><div class='del'>-	ADDRESSBOOK_VIEW_NONE, /* initialized to this */</div><div class='del'>-	ADDRESSBOOK_VIEW_TABLE,</div><div class='del'>-	ADDRESSBOOK_VIEW_MINICARD</div><div class='del'>-} AddressbookViewType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	AddressbookViewType view_type;</div><div class='del'>-	EBook *book;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	GtkWidget *minicard_hbox;</div><div class='del'>-	GtkWidget *canvas;</div><div class='del'>-	GnomeCanvasItem *view;</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	GtkAllocation last_alloc;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	BonoboPropertyBag *properties;</div><div class='del'>-	char *uri;</div><div class='del'>-} AddressbookView;</div><div class='del'>-</div><div class='del'>-static void change_view_type (AddressbookView *view, AddressbookViewType view_type);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_deactivate (BonoboControl *control, BonoboUIHandler *uih)</div><div class='del'>-{</div><div class='del'>-	/* how to remove a menu item */</div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/File/Print");</div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/File/TestSelectNames");</div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/View/&lt;sep&gt;");</div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/View/Toggle View"); </div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/Actions/New Contact"); </div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	bonobo_ui_handler_menu_remove (uih, "/Actions/New Directory Server");</div><div class='del'>-#endif</div><div class='del'>-	/* remove our toolbar */</div><div class='del'>-	bonobo_ui_handler_dock_remove (uih, "/Toolbar");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_nothing_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	g_print ("Yow! I am called back!\n");</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,</div><div class='del'>-	    gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);</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,</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'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the add_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_add_card (book, card, card_added_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the commit_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_commit_card (book, card, card_modified_cb, NULL);</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 (EContactEditor *ce, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	EBook *book;</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	GtkObject *object;</div><div class='del'>-</div><div class='del'>-	card = e_card_new("");</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		object = GTK_OBJECT(view-&gt;view);</div><div class='del'>-	else</div><div class='del'>-		object = GTK_OBJECT(view-&gt;model);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(object, "book", &amp;book, NULL);</div><div class='del'>-	g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	ce = e_contact_editor_new (card, TRUE);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "add_card",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_card_cb), book);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "commit_card",</div><div class='del'>-			    GTK_SIGNAL_FUNC (commit_card_cb), book);</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_object_sink(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-toggle_view_as_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = user_data;</div><div class='del'>-	</div><div class='del'>-	if (view-&gt;view_type == ADDRESSBOOK_VIEW_TABLE)</div><div class='del'>-		change_view_type (view, ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-	else</div><div class='del'>-		change_view_type (view, ADDRESSBOOK_VIEW_TABLE);</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'>-null_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_server_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	ELDAPServer server;</div><div class='del'>-	char *uri;</div><div class='del'>-	EBook *book;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	GtkObject *object;</div><div class='del'>-</div><div class='del'>-	/* fill in the defaults */</div><div class='del'>-	server.host = g_strdup("");</div><div class='del'>-	server.port = 389;</div><div class='del'>-	server.description = g_strdup("");</div><div class='del'>-	server.rootdn = g_strdup("");</div><div class='del'>-</div><div class='del'>-	e_ldap_server_editor_show (&amp;server);</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		object = GTK_OBJECT(view-&gt;view);</div><div class='del'>-	else</div><div class='del'>-		object = GTK_OBJECT(view-&gt;model);</div><div class='del'>-	gtk_object_get(object, "book", &amp;book, NULL);</div><div class='del'>-	g_assert (E_IS_BOOK (book));</div><div class='del'>-	</div><div class='del'>-	/* XXX write out the new server info */</div><div class='del'>-</div><div class='del'>-	/* now update the view */</div><div class='del'>-	uri = g_strdup_printf ("ldap://%s:%d/%s", server.host, server.port, server.rootdn);</div><div class='del'>-</div><div class='del'>-	e_book_unload_uri (book);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, uri, null_cb, NULL)) {</div><div class='del'>-		g_warning ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_query (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GtkObject *object;</div><div class='del'>-	char *query = NULL;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		object = GTK_OBJECT(view-&gt;view);</div><div class='del'>-	else</div><div class='del'>-		object = GTK_OBJECT(view-&gt;model);</div><div class='del'>-</div><div class='del'>-	if (object)</div><div class='del'>-		gtk_object_get (object, "query", &amp;query, NULL);</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_query (AddressbookView *view, char *query)</div><div class='del'>-{</div><div class='del'>-	GtkObject *object;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		object = GTK_OBJECT(view-&gt;view);</div><div class='del'>-	else</div><div class='del'>-		object = GTK_OBJECT(view-&gt;model);</div><div class='del'>-</div><div class='del'>-	gtk_object_set (object, </div><div class='del'>-			"query", query, </div><div class='del'>-			NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_book(AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;book)</div><div class='del'>-		gtk_object_set(view-&gt;view ? GTK_OBJECT(view-&gt;view) : GTK_OBJECT(view-&gt;model),</div><div class='del'>-			       "book", view-&gt;book,</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	gint result;</div><div class='del'>-	GtkWidget* search_entry = gtk_entry_new();</div><div class='del'>-	gchar* search_text;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	GtkWidget* dlg = gnome_dialog_new ("Search Contacts", "Find",</div><div class='del'>-					   GNOME_STOCK_BUTTON_CANCEL, NULL);</div><div class='del'>-</div><div class='del'>-	search_text = get_query (view);</div><div class='del'>-	gtk_entry_set_text(GTK_ENTRY(search_entry), search_text);</div><div class='del'>-	g_free (search_text);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)-&gt;vbox),</div><div class='del'>-			    search_entry, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (dlg);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close_hides (GNOME_DIALOG (dlg), TRUE);</div><div class='del'>-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-</div><div class='del'>-	/* If the user clicks "okay"...*/</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		search_text = gtk_entry_get_text(GTK_ENTRY(search_entry));</div><div class='del'>-		set_query (view, search_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'>-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was deleted\n", __FILE__, __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_contact_cb (BonoboUIHandler *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_minicard_view_remove_selection (E_MINICARD_VIEW(view-&gt;view), card_deleted_cb, NULL);</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'>-	ETable *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, .5 * 72, .5 * 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'>-					       7.5 * 72,</div><div class='del'>-					       10.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, .5 * 72, .5 * 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'>-					       7.5 * 72,</div><div class='del'>-					       10.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'>-		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'>-static void</div><div class='del'>-print_cb (BonoboUIHandler *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'>-		char *query = get_query(view);</div><div class='del'>-		GtkWidget *print = e_contact_print_dialog_new(view-&gt;book, query);</div><div class='del'>-		g_free(query);</div><div class='del'>-		gtk_widget_show_all(print);</div><div class='del'>-	} else {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		EPrintable *printable;</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'>-		printable = e_table_get_printable(E_TABLE(view-&gt;table));</div><div class='del'>-</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(view-&gt;table));</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view-&gt;table);</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'>-static void</div><div class='del'>-test_select_names_cb (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	ESelectNames *names = E_SELECT_NAMES(e_select_names_new());</div><div class='del'>-	</div><div class='del'>-	e_select_names_add_section(names, _("To"), "to");</div><div class='del'>-	e_select_names_add_section(names, _("From"), "from");</div><div class='del'>-	e_select_names_add_section(names, _("Cc"), "cc");</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(names));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo gnome_toolbar [] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("New"), N_("Create a new contact"), new_contact_cb, GNOME_STOCK_PIXMAP_NEW),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Find"), N_("Find a contact"), find_contact_cb, GNOME_STOCK_PIXMAP_SEARCH),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print contacts"), do_nothing_cb, GNOME_STOCK_PIXMAP_PRINT),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Delete"), N_("Delete a contact"), delete_contact_cb, GNOME_STOCK_PIXMAP_TRASH),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-search_entry_activated (GtkWidget* widget, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	char* search_word = gtk_entry_get_text(GTK_ENTRY(widget));</div><div class='del'>-	char* search_query;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	if (search_word &amp;&amp; strlen (search_word))</div><div class='del'>-		search_query = g_strdup_printf (</div><div class='del'>-			"(contains \"full_name\" \"%s\")",</div><div class='del'>-			search_word);</div><div class='del'>-	else</div><div class='del'>-		search_query = g_strdup (</div><div class='del'>-			"(contains \"full_name\" \"\")");</div><div class='del'>-</div><div class='del'>-	set_query(view, search_query);</div><div class='del'>-</div><div class='del'>-	g_free (search_query);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget*</div><div class='del'>-make_quick_search_widget (GtkSignalFunc start_search_func,</div><div class='del'>-			  gpointer user_data_for_search)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *search_vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	GtkWidget *search_entry = gtk_entry_new ();</div><div class='del'>-</div><div class='del'>-	if (start_search_func)</div><div class='del'>-	{</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (search_entry), "activate",</div><div class='del'>-				    (GtkSignalFunc) search_entry_activated,</div><div class='del'>-				    user_data_for_search);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* add the search entry to the our search_vbox */</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (search_vbox), search_entry,</div><div class='del'>-			    FALSE, TRUE, 3);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (search_vbox),</div><div class='del'>-			    gtk_label_new("Quick Search"),</div><div class='del'>-			    FALSE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	return search_vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate (BonoboControl *control, BonoboUIHandler *uih,</div><div class='del'>-		  AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIHandler  remote_uih;</div><div class='del'>-	GtkWidget *toolbar, *toolbar_frame;</div><div class='del'>-	BonoboControl *toolbar_control;</div><div class='del'>-	GtkWidget *hbox = gtk_hbox_new (FALSE, 0);</div><div class='del'>-	GtkWidget *quick_search_widget;</div><div class='del'>-</div><div class='del'>-	remote_uih = bonobo_control_get_remote_ui_handler (control);</div><div class='del'>-	bonobo_ui_handler_set_container (uih, remote_uih);		</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_separator (uih, "/View/&lt;sep&gt;", -1);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/Print",</div><div class='del'>-					 N_("Print"),</div><div class='del'>-					 NULL, -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, print_cb,</div><div class='del'>-					 (gpointer) view);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/TestSelectNames",</div><div class='del'>-					 N_("Test Select Names"),</div><div class='del'>-					 NULL, -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, test_select_names_cb,</div><div class='del'>-					 (gpointer) view);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/View/Toggle View",</div><div class='del'>-					 N_("As _Table"),</div><div class='del'>-					 NULL, -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, toggle_view_as_cb,</div><div class='del'>-					 (gpointer)view);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/Actions/New Contact",</div><div class='del'>-					 N_("_New Contact"),       </div><div class='del'>-					 NULL, -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, new_contact_cb,</div><div class='del'>-					 (gpointer)view);</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/Actions/New Directory Server",</div><div class='del'>-					 N_("N_ew Directory Server"),       </div><div class='del'>-					 NULL, -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, new_server_cb,</div><div class='del'>-					 (gpointer)view);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,</div><div class='del'>-				   GTK_TOOLBAR_BOTH);</div><div class='del'>-</div><div class='del'>-	gnome_app_fill_toolbar_with_data (GTK_TOOLBAR (toolbar),</div><div class='del'>-					  gnome_toolbar, </div><div class='del'>-					  NULL, view);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), toolbar, FALSE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* add the search_vbox to the hbox which will be our toolbar */</div><div class='del'>-	quick_search_widget = make_quick_search_widget (</div><div class='del'>-		search_entry_activated, view);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox),</div><div class='del'>-			    quick_search_widget,</div><div class='del'>-			    FALSE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	toolbar_frame = gtk_frame_new (NULL);</div><div class='del'>-	gtk_frame_set_shadow_type (GTK_FRAME (toolbar_frame), GTK_SHADOW_OUT);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (toolbar_frame), hbox);</div><div class='del'>-	gtk_widget_show (toolbar_frame);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (toolbar_frame);</div><div class='del'>-</div><div class='del'>-	toolbar_control = bonobo_control_new (toolbar_frame);</div><div class='del'>-	bonobo_ui_handler_dock_add (</div><div class='del'>-		uih, "/Toolbar",</div><div class='del'>-		bonobo_object_corba_objref (BONOBO_OBJECT (toolbar_control)),</div><div class='del'>-		GNOME_DOCK_ITEM_BEH_EXCLUSIVE,</div><div class='del'>-		GNOME_DOCK_TOP,</div><div class='del'>-		1, 1, 0);</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'>-	BonoboUIHandler  *uih;</div><div class='del'>-</div><div class='del'>-	uih = bonobo_control_get_ui_handler (control);</div><div class='del'>-	g_assert (uih);</div><div class='del'>-	</div><div class='del'>-	if (activate)</div><div class='del'>-		control_activate (control, uih, view);</div><div class='del'>-	else</div><div class='del'>-		control_deactivate (control, uih);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_view_free(AddressbookView *view)</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'>-	if (view-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-	g_free(view-&gt;uri);</div><div class='del'>-	g_free(view);</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'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		set_book (view);</div><div class='del'>-	} else {</div><div class='del'>-		GtkWidget *warning_dialog, *label, *href;</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'>-        	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 have tried\n"</div><div class='del'>-			  "to access an LDAP server and don't have LDAP support\n"</div><div class='del'>-			  "compiled in.  If you've entered a URI, check the URI for\n"</div><div class='del'>-			  "correctness and reenter.  If not, you probably have\n"</div><div class='del'>-			  "attempted to access an LDAP server.  If you wish to be\n"</div><div class='del'>-			  "able to use LDAP, you'll need to download and install\n"</div><div class='del'>-			  "OpenLDAP and recompile and install evolution.\n"));</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'>-		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'>-		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'>-		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 destroy_callback(GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = data;</div><div class='del'>-	addressbook_view_free(view);</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'>-	AddressbookView *view = data;</div><div class='del'>-	view-&gt;last_alloc = *allocation;</div><div class='del'>-	gnome_canvas_item_set( view-&gt;view,</div><div class='del'>-			       "height", (double) allocation-&gt;height,</div><div class='del'>-			       NULL );</div><div class='del'>-	gnome_canvas_item_set( view-&gt;view,</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;view),</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-&gt;canvas ), 0, 0, width, allocation-&gt;height );</div><div class='del'>-	gnome_canvas_item_set( view-&gt;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'>-	AddressbookView *view = data;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, view-&gt;last_alloc.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS(view-&gt;canvas), 0, 0, width, view-&gt;last_alloc.height );</div><div class='del'>-	gnome_canvas_item_set( view-&gt;rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) view-&gt;last_alloc.height,</div><div class='del'>-			       NULL );	</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'>-	  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'>-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'>-	  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_file;</div><div class='del'>-	char *uri_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-&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 (view-&gt;book);</div><div class='del'>-			g_free (view-&gt;uri);</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_file = g_concat_dir_and_file(view-&gt;uri + 7, "uri");</div><div class='del'>-</div><div class='del'>-		uri_data = e_read_file(uri_file);</div><div class='del'>-</div><div class='del'>-		if (!uri_data) {</div><div class='del'>-			char *file_name = g_concat_dir_and_file(view-&gt;uri + 7, "addressbook.db");</div><div class='del'>-			uri_data = g_strdup_printf("file://%s", file_name);</div><div class='del'>-			g_free(file_name);</div><div class='del'>-		}</div><div class='del'>-		if (! e_book_load_uri (view-&gt;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'>-		</div><div class='del'>-		g_free(uri_data);</div><div class='del'>-		g_free(uri_file);</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'>-#define SPEC "&lt;?xml version=\"1.0\"?&gt;    \</div><div class='del'>-&lt;ETableSpecification&gt;                    \</div><div class='del'>-  &lt;columns-shown&gt;                        \</div><div class='del'>-    &lt;column&gt;0&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;1&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;2&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;3&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;4&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;5&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;6&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;7&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;8&lt;/column&gt;                   \</div><div class='del'>-    &lt;column&gt;10&lt;/column&gt;                  \</div><div class='del'>-  &lt;/columns-shown&gt;                       \</div><div class='del'>-  &lt;grouping&gt;                             \</div><div class='del'>-    &lt;leaf column=\"0\" ascending=\"1\"/&gt; \</div><div class='del'>-  &lt;/grouping&gt;                            \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-teardown_minicard_view (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;view) {</div><div class='del'>-		gtk_object_destroy(GTK_OBJECT(view-&gt;view));</div><div class='del'>-		view-&gt;view = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (view-&gt;minicard_hbox) {</div><div class='del'>-		gtk_widget_destroy(view-&gt;minicard_hbox);</div><div class='del'>-		view-&gt;minicard_hbox = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	view-&gt;canvas = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	AddressbookView *view;</div><div class='del'>-	char letter;</div><div class='del'>-} LetterClosure;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-jump_to_letter(GtkWidget *button, LetterClosure *closure)</div><div class='del'>-{</div><div class='del'>-	if (closure-&gt;view-&gt;view)</div><div class='del'>-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(closure-&gt;view-&gt;view), closure-&gt;letter);</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'>-	g_free(closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-connect_button (AddressbookView *view, GladeXML *gui, char letter)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	LetterClosure *closure;</div><div class='del'>-	name = g_strdup_printf("button-%c", letter);</div><div class='del'>-	button = glade_xml_get_widget(gui, name);</div><div class='del'>-	g_free(name);</div><div class='del'>-	if (!button)</div><div class='del'>-		return;</div><div class='del'>-	closure = g_new(LetterClosure, 1);</div><div class='del'>-	closure-&gt;view = view;</div><div class='del'>-	closure-&gt;letter = letter;</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(jump_to_letter), 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'>-static GtkWidget *</div><div class='del'>-create_alphabet (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	char letter;</div><div class='del'>-	GladeXML *gui = glade_xml_new (EVOLUTION_GLADEDIR "/alphabet.glade", NULL);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(gui, "scrolledwindow-top");</div><div class='del'>-	if (!widget) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	connect_button(view, gui, '1');</div><div class='del'>-	for (letter = 'a'; letter &lt;= 'z'; letter ++) {</div><div class='del'>-		connect_button(view, gui, letter);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(gui));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_minicard_view (AddressbookView *view, char *initial_query)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *scrollbar;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	GtkWidget *alphabet;</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'>-	view-&gt;minicard_hbox = gtk_hbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-	view-&gt;canvas = e_canvas_new();</div><div class='del'>-	view-&gt;rect = gnome_canvas_item_new(</div><div class='del'>-		gnome_canvas_root( GNOME_CANVAS( view-&gt;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'>-</div><div class='del'>-	view-&gt;view = gnome_canvas_item_new(</div><div class='del'>-		gnome_canvas_root( GNOME_CANVAS( view-&gt;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'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( view-&gt;canvas ), "reflow",</div><div class='del'>-			    GTK_SIGNAL_FUNC( resize ),</div><div class='del'>-			    view);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( view-&gt;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), view-&gt;canvas, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	scrollbar = gtk_hscrollbar_new(</div><div class='del'>-		gtk_layout_get_hadjustment(GTK_LAYOUT(view-&gt;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'>-	gtk_box_pack_start(GTK_BOX(view-&gt;minicard_hbox), vbox, 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(view-&gt;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_box_pack_start(GTK_BOX(view-&gt;vbox), view-&gt;minicard_hbox, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all( GTK_WIDGET(view-&gt;minicard_hbox) );</div><div class='del'>-</div><div class='del'>-	/* Connect the signals */</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( view-&gt;canvas ), "size_allocate",</div><div class='del'>-			    GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-			    ( gpointer ) view );</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gdk_window_set_back_pixmap(</div><div class='del'>-		GTK_LAYOUT(view-&gt;canvas)-&gt;bin_window, NULL, FALSE);</div><div class='del'>-#endif</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'>-</div><div class='del'>-static void</div><div class='del'>-teardown_table_view (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;table) {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (view-&gt;table));</div><div class='del'>-		view-&gt;table = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (view-&gt;model) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (view-&gt;model));</div><div class='del'>-		view-&gt;model = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (view-&gt;simple) {</div><div class='del'>-		gtk_object_destroy (GTK_OBJECT (view-&gt;simple));</div><div class='del'>-		view-&gt;simple = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_double_click(ETable *table, gint row, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(view-&gt;model), row);</div><div class='del'>-	EBook *book;</div><div class='del'>-	EContactEditor *ce;</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'>-	g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	ce = e_contact_editor_new (card, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "add_card",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_card_cb), book);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "commit_card",</div><div class='del'>-			    GTK_SIGNAL_FUNC (commit_card_cb), book);</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_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as (GtkWidget *widget, ECard *card)</div><div class='del'>-{</div><div class='del'>-	e_contact_save_as(_("Save as VCard"), card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-table_right_click(ETable *table, gint row, gint col, GdkEvent *event, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(view-&gt;model), row);</div><div class='del'>-	EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, {NULL, NULL, NULL, 0} };</div><div class='del'>-</div><div class='del'>-	e_popup_menu_run (menu, (GdkEventButton *)event, 0, card);</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'>-create_table_view (AddressbookView *view, char *initial_query)</div><div class='del'>-{</div><div class='del'>-	ECell *cell_left_just;</div><div class='del'>-	ETableHeader *e_table_header;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	view-&gt;simple = e_card_simple_new(NULL);</div><div class='del'>-</div><div class='del'>-	view-&gt;model = e_addressbook_model_new();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	  Next we create a header.  The ETableHeader is used in two</div><div class='del'>-	  different way.  The first is the full_header.  This is the</div><div class='del'>-	  list of possible columns in the view.  The second use is</div><div class='del'>-	  completely internal.  Many of the ETableHeader functions are</div><div class='del'>-	  for that purpose.  The only functions we really need are</div><div class='del'>-	  e_table_header_new and e_table_header_add_col.</div><div class='del'>-</div><div class='del'>-	  First we create the header.  */</div><div class='del'>-	e_table_header = e_table_header_new ();</div><div class='del'>-	</div><div class='del'>-	/* Next we have to build renderers for all of the columns.</div><div class='del'>-	   Since all our columns are text columns, we can simply use</div><div class='del'>-	   the same renderer over and over again.  If we had different</div><div class='del'>-	   types of columns, we could use a different renderer for</div><div class='del'>-	   each column. */</div><div class='del'>-	cell_left_just = e_cell_text_new (view-&gt;model, NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-		</div><div class='del'>-	/* Next we create a column object for each view column and add</div><div class='del'>-	   them to the header.  We don't create a column object for</div><div class='del'>-	   the importance column since it will not be shown. */</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_FIELD_LAST - 1; i++){</div><div class='del'>-		/* Create the column. */</div><div class='del'>-		ETableCol *ecol = e_table_col_new (</div><div class='del'>-						   i, e_card_simple_get_name(view-&gt;simple, i+1),</div><div class='del'>-						   1.0, 20, cell_left_just,</div><div class='del'>-						   g_str_compare, TRUE);</div><div class='del'>-		/* Add it to the header. */</div><div class='del'>-		e_table_header_add_column (e_table_header, ecol, i);</div><div class='del'>-	}</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'>-	view-&gt;table = e_table_new (e_table_header, E_TABLE_MODEL(view-&gt;model), SPEC);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(view-&gt;table), "double_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_double_click), view);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(view-&gt;table), "right_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_right_click), view);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(view-&gt;vbox), view-&gt;table, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all( GTK_WIDGET(view-&gt;table) );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_view_type (AddressbookView *view, AddressbookViewType view_type)</div><div class='del'>-{</div><div class='del'>-	char *query = NULL;</div><div class='del'>-	BonoboUIHandler *uih = bonobo_control_get_ui_handler (view-&gt;control);</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;view_type != ADDRESSBOOK_VIEW_NONE)</div><div class='del'>-		query = get_query(view);</div><div class='del'>-	else</div><div class='del'>-		query = g_strdup("(contains \"full_name\" \"\")");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case ADDRESSBOOK_VIEW_MINICARD:</div><div class='del'>-		teardown_table_view (view);</div><div class='del'>-		create_minicard_view (view, query);</div><div class='del'>-		if (uih)</div><div class='del'>-			bonobo_ui_handler_menu_set_label (uih, "/View/Toggle View",</div><div class='del'>-							  N_("As _Table"));</div><div class='del'>-		break;</div><div class='del'>-	case ADDRESSBOOK_VIEW_TABLE:</div><div class='del'>-		teardown_minicard_view (view);</div><div class='del'>-		create_table_view (view, query);</div><div class='del'>-		if (uih)</div><div class='del'>-			bonobo_ui_handler_menu_set_label (uih, "/View/Toggle View",</div><div class='del'>-							  N_("As _Minicards"));</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'>-		g_free (query);</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'>-	/* set the book */</div><div class='del'>-	set_book (view);</div><div class='del'>-</div><div class='del'>-	/* and reset the query */</div><div class='del'>-	if (query)</div><div class='del'>-		set_query (view, query);</div><div class='del'>-	g_free (query);</div><div class='del'>-}</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'>-</div><div class='del'>-	view = g_new0 (AddressbookView, 1);</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;model = NULL;</div><div class='del'>-	view-&gt;view = NULL;</div><div class='del'>-</div><div class='del'>-	/* create the initial view */</div><div class='del'>-	change_view_type (view, ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all( view-&gt;vbox );</div><div class='del'>-</div><div class='del'>-	/* create the view's ebook */</div><div class='del'>-	view-&gt;book = e_book_new ();</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 (</div><div class='del'>-		view-&gt;properties, 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_property_bag (view-&gt;control,</div><div class='del'>-					 view-&gt;properties);</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 (CONTROL_FACTORY_ID,</div><div class='del'>-								  addressbook_factory,</div><div class='del'>-								  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='head'>diff --git a/addressbook/gui/component/addressbook.gnorba b/addressbook/gui/component/addressbook.gnorba<br/>deleted file mode 100644<br/>index bc3830686d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.gnorba?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook.gnorba</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-[control-factory:addressbook]</div><div class='del'>-type=exe</div><div class='del'>-repo_id=IDL:GNOME/GenericFactory:1.0</div><div class='del'>-description=Factory for the sample Addressbook control</div><div class='del'>-location_info=evolution-addressbook</div><div class='del'>-</div><div class='del'>-[control:addressbook]</div><div class='del'>-type=factory</div><div class='del'>-repo_id=IDL:BonoboControl/addressbook-control:1.0 IDL:GNOME/Control:1.0</div><div class='del'>-description=A sample Bonobo control which displays an addressbook.</div><div class='del'>-location_info=control-factory:addressbook</div><div class='del'>-</div><div class='del'>-[evolution-shell-component-factory:addressbook]</div><div class='del'>-type=exe</div><div class='del'>-repo_id=IDL:GNOME/GenericFactory:1.0</div><div class='del'>-description=Factory for the Evolution addressbook component.</div><div class='del'>-location_info=evolution-addressbook</div><div class='del'>-</div><div class='del'>-[evolution-shell-component:addressbook]</div><div class='del'>-type=factory</div><div class='del'>-repo_id=IDL:Evolution/ShellComponent:1.0</div><div class='del'>-description=Evolution component for handling contacts.</div><div class='del'>-location_info=evolution-shell-component-factory:addressbook</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 66c5a7e4e6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +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'>-</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/addressbook.oafinfo b/addressbook/gui/component/addressbook.oafinfo<br/>deleted file mode 100644<br/>index 15820b2e03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/addressbook.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"</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 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:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"&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:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"</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 Evolution addressbook component."/&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:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/gui/component/alphabet.glade b/addressbook/gui/component/alphabet.glade<br/>deleted file mode 100644<br/>index bc6e5f3798..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/alphabet.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/alphabet.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,357 +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;alphabet&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;alphabet&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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;alphabet.glade.h&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;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;window2&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window2&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;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;scrolledwindow-top&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'>-</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;border_width&gt;4&lt;/border_width&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;vbox2&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;27&lt;/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;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button-1&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;123&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;button-a&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;a&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;button-b&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;b&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;button-c&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;c&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;button-d&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;d&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;button-e&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;e&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;button-f&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;f&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;button-g&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;g&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;button-h&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;h&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;button-i&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;i&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;button-j&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;j&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;button-k&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;k&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;button-l&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;l&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;button-m&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;m&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;button-n&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;n&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;button-o&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;o&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;button-p&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;p&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;button-q&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;q&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;button-r&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;r&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;button-s&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;s&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;button-t&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;t&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;button-u&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;u&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;button-v&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;v&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;button-w&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;w&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;button-x&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;x&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;button-y&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;y&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;button-z&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;z&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'>-    &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/alphabet.glade.h b/addressbook/gui/component/alphabet.glade.h<br/>deleted file mode 100644<br/>index 2448eeb4fc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/alphabet.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/alphabet.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("window2");</div><div class='del'>-gchar *s = N_("123");</div><div class='del'>-gchar *s = N_("a");</div><div class='del'>-gchar *s = N_("b");</div><div class='del'>-gchar *s = N_("c");</div><div class='del'>-gchar *s = N_("d");</div><div class='del'>-gchar *s = N_("e");</div><div class='del'>-gchar *s = N_("f");</div><div class='del'>-gchar *s = N_("g");</div><div class='del'>-gchar *s = N_("h");</div><div class='del'>-gchar *s = N_("i");</div><div class='del'>-gchar *s = N_("j");</div><div class='del'>-gchar *s = N_("k");</div><div class='del'>-gchar *s = N_("l");</div><div class='del'>-gchar *s = N_("m");</div><div class='del'>-gchar *s = N_("n");</div><div class='del'>-gchar *s = N_("o");</div><div class='del'>-gchar *s = N_("p");</div><div class='del'>-gchar *s = N_("q");</div><div class='del'>-gchar *s = N_("r");</div><div class='del'>-gchar *s = N_("s");</div><div class='del'>-gchar *s = N_("t");</div><div class='del'>-gchar *s = N_("u");</div><div class='del'>-gchar *s = N_("v");</div><div class='del'>-gchar *s = N_("w");</div><div class='del'>-gchar *s = N_("x");</div><div class='del'>-gchar *s = N_("y");</div><div class='del'>-gchar *s = N_("z");</div><div class='head'>diff --git a/addressbook/gui/component/e-addressbook-model.c b/addressbook/gui/component/e-addressbook-model.c<br/>deleted file mode 100644<br/>index f5d2fca7cb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-addressbook-model.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-addressbook-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,376 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Helix Code, 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'>-</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'>-/*</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'>-};</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'>-	int i;</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'>-	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)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book));</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'>-	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'>-addressbook_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'>-addressbook_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);</div><div class='del'>-	return addressbook-&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'>-addressbook_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);</div><div class='del'>-	const char *value;</div><div class='del'>-	if ( col &gt;= E_CARD_SIMPLE_FIELD_LAST - 1|| row &gt;= addressbook-&gt;data_count )</div><div class='del'>-		return NULL;</div><div class='del'>-	value = e_card_simple_get_const(addressbook-&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'>-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);</div><div class='del'>-	ECard *card;</div><div class='del'>-	if ( col &gt;= E_CARD_SIMPLE_FIELD_LAST - 1|| row &gt;= addressbook-&gt;data_count )</div><div class='del'>-		return;</div><div class='del'>-	e_card_simple_set(addressbook-&gt;data[row],</div><div class='del'>-			  col + 1,</div><div class='del'>-			  val);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(addressbook-&gt;data[row]),</div><div class='del'>-		       "card", &amp;card,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_book_commit_card(addressbook-&gt;book, card, NULL, 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'>-addressbook_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'>-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 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'>-	model-&gt;data = g_realloc(model-&gt;data, (model-&gt;data_count + g_list_length((GList *)cards)) * sizeof(ECard *));</div><div class='del'>-	for ( ; cards; cards = cards-&gt;next) {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(cards-&gt;data));</div><div class='del'>-		model-&gt;data[model-&gt;data_count++] = e_card_simple_new (E_CARD(cards-&gt;data));</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'>-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'>-	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'>-			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'>-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_simple_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_simple_new(E_CARD(cards-&gt;data));</div><div class='del'>-				gtk_object_ref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-				e_table_model_row_changed(E_TABLE_MODEL(model), 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'>-e_addressbook_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 = 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'>-	</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;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'>-}</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 \"full_name\" \"\")");</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;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</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'>-	int i;</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)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book_view));</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'>-</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'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	e_table_model_changed(E_TABLE_MODEL(model));</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'>-		e_book_get_book_view(model-&gt;book, model-&gt;query, book_view_loaded, model);</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; 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'>-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'>-			gtk_object_unref(GTK_OBJECT(model-&gt;book));</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'>-			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'>-		}</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'>-	}</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'>-	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'>-ETableModel *</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 E_TABLE_MODEL(et);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/e-addressbook-model.h b/addressbook/gui/component/e-addressbook-model.h<br/>deleted file mode 100644<br/>index bff9a21d00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-addressbook-model.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-addressbook-model.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'>-#ifndef _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-#define _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include "e-table-model.h"</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_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'>-/* 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 {</div><div class='del'>-	ETableModel 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'>-	ECardSimple **data;</div><div class='del'>-	int data_count;</div><div class='del'>-</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id;</div><div class='del'>-} EAddressbookModel;</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'>-} EAddressbookModelClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_addressbook_model_get_type (void);</div><div class='del'>-ETableModel *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'>-</div><div class='del'>-#endif /* _E_ADDRESSBOOK_MODEL_H_ */</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 e4a802439a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-cardlist-model.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-cardlist-model.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'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Helix Code, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-cardlist-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'>-</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_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'>-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'>-		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'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!found) {</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'>-			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'>-}</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 b7df356342..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-cardlist-model.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 "e-table-model.h"</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/e-ldap-server-dialog.c b/addressbook/gui/component/e-ldap-server-dialog.c<br/>deleted file mode 100644<br/>index d64549cc2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-ldap-server-dialog.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-ldap-server-dialog.c</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'>- * e-ldap-server-dialog.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Toshok &lt;toshok@helixcode.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 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 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'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "e-ldap-server-dialog.h"</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	ELDAPServer *server;</div><div class='del'>-} ELDAPServerDialog;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_server_info (ELDAPServerDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	ELDAPServer *ldap_server = dialog-&gt;server;</div><div class='del'>-	GtkEditable *editable;</div><div class='del'>-	int position;</div><div class='del'>-	char buf[128];</div><div class='del'>-</div><div class='del'>-	/* the server description */</div><div class='del'>-	position = 0;</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "description-entry"));</div><div class='del'>-	gtk_editable_delete_text (editable, 0, -1);</div><div class='del'>-	gtk_editable_insert_text (editable, ldap_server-&gt;description, strlen (ldap_server-&gt;description), &amp;position);</div><div class='del'>-</div><div class='del'>-	/* the server hostname */</div><div class='del'>-	position = 0;</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "server-entry"));</div><div class='del'>-	gtk_editable_delete_text (editable, 0, -1);</div><div class='del'>-	gtk_editable_insert_text (editable, ldap_server-&gt;host, strlen (ldap_server-&gt;host), &amp;position);</div><div class='del'>-</div><div class='del'>-	/* the server port */</div><div class='del'>-	position = 0;</div><div class='del'>-	g_snprintf (buf, sizeof(buf), "%d", ldap_server-&gt;port);</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "port-entry"));</div><div class='del'>-	gtk_editable_delete_text (editable, 0, -1);</div><div class='del'>-	gtk_editable_insert_text (editable, buf, strlen (buf), &amp;position);</div><div class='del'>-</div><div class='del'>-	/* the root dn */</div><div class='del'>-	position = 0;</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "root-dn-entry"));</div><div class='del'>-	gtk_editable_delete_text (editable, 0, -1);</div><div class='del'>-	gtk_editable_insert_text (editable, ldap_server-&gt;rootdn, strlen (ldap_server-&gt;rootdn), &amp;position);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_server_info (ELDAPServerDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	ELDAPServer *ldap_server = dialog-&gt;server;</div><div class='del'>-	GtkEditable *editable;</div><div class='del'>-	char *description, *server, *port, *rootdn;</div><div class='del'>-</div><div class='del'>-	/* the server description */</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "description-entry"));</div><div class='del'>-	description = gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-	if (description &amp;&amp; *description) {</div><div class='del'>-		if (ldap_server-&gt;description)</div><div class='del'>-			g_free(ldap_server-&gt;description);</div><div class='del'>-		ldap_server-&gt;description = description;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the server hostname */</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "server-entry"));</div><div class='del'>-	server = gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-	if (server &amp;&amp; *server) {</div><div class='del'>-		if (ldap_server-&gt;host)</div><div class='del'>-			g_free(ldap_server-&gt;host);</div><div class='del'>-		ldap_server-&gt;host = server;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the server port */</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "port-entry"));</div><div class='del'>-	port = gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-	if (port &amp;&amp; *port) {</div><div class='del'>-		ldap_server-&gt;port = atoi(port);</div><div class='del'>-	}</div><div class='del'>-	g_free(port);</div><div class='del'>-</div><div class='del'>-	/* the root dn */</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "root-dn-entry"));</div><div class='del'>-	rootdn = gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-	if (rootdn &amp;&amp; *rootdn) {</div><div class='del'>-		if (ldap_server-&gt;rootdn)</div><div class='del'>-			g_free (ldap_server-&gt;rootdn);</div><div class='del'>-		ldap_server-&gt;rootdn = rootdn;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_ldap_server_editor_show(ELDAPServer *server)</div><div class='del'>-{</div><div class='del'>-	ELDAPServerDialog *dialog = g_new0(ELDAPServerDialog, 1);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;server = server;</div><div class='del'>-	dialog-&gt;gui = glade_xml_new (EVOLUTION_GLADEDIR "/ldap-server-dialog.glade", NULL);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;dialog = glade_xml_get_widget(dialog-&gt;gui, "ldap-server-dialog");</div><div class='del'>-</div><div class='del'>-	fill_in_server_info (dialog);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_run (GNOME_DIALOG(dialog-&gt;dialog));</div><div class='del'>-</div><div class='del'>-	extract_server_info (dialog);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG(dialog-&gt;dialog));</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/e-ldap-server-dialog.h b/addressbook/gui/component/e-ldap-server-dialog.h<br/>deleted file mode 100644<br/>index f0e73d1ebc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-ldap-server-dialog.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-ldap-server-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-</div><div class='del'>-#ifndef __E_LDAP_SERVER_DIALOG_H__</div><div class='del'>-#define __E_LDAP_SERVER_DIALOG_H__</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *description;</div><div class='del'>-	char *host;</div><div class='del'>-	int port;</div><div class='del'>-	char *rootdn;</div><div class='del'>-} ELDAPServer;</div><div class='del'>-</div><div class='del'>-void e_ldap_server_editor_show(ELDAPServer *server);</div><div class='del'>-</div><div class='del'>-#endif /* __E_LDAP_SERVER_DIALOG_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/e-select-names.c b/addressbook/gui/component/e-select-names.c<br/>deleted file mode 100644<br/>index 517d071ede..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-select-names.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-select-names.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,343 +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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-select-names.h"</div><div class='del'>-#include &lt;e-table-simple.h&gt;</div><div class='del'>-#include &lt;e-table.h&gt;</div><div class='del'>-#include &lt;e-cell-text.h&gt;</div><div class='del'>-#include &lt;e-addressbook-model.h&gt;</div><div class='del'>-#include &lt;e-cardlist-model.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.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'>-</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'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char         *title;</div><div class='del'>-	ETableModel  *model;</div><div class='del'>-	ESelectNames *names;</div><div class='del'>-} ESelectNamesChild;</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'>-	gtk_object_add_arg_type ("ESelectNames::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNames::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</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-header=\"1\"&gt;    	       \</div><div class='del'>-	&lt;columns-shown&gt;                  			       \</div><div class='del'>-		&lt;column&gt; 0 &lt;/column&gt;     			       \</div><div class='del'>-	&lt;/columns-shown&gt;                 			       \</div><div class='del'>-	&lt;grouping&gt; &lt;leaf column=\"0\" ascending=\"1\"/&gt; &lt;/grouping&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, ETableModel *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'>-		       NULL);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(book));</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 *model;</div><div class='del'>-	ETableHeader *header;</div><div class='del'>-	ECell *cell_left_just;</div><div class='del'>-	EBook *book;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	model = e_addressbook_model_new();</div><div class='del'>-	cell_left_just = e_cell_text_new (model, NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-</div><div class='del'>-	header = e_table_header_new ();</div><div class='del'>-	e_table_header_add_column (header, e_table_col_new (0, "Full Name", 1.0, 20, cell_left_just,</div><div class='del'>-							    g_str_compare, TRUE), 0);</div><div class='del'>-</div><div class='del'>-	book = e_book_new();</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(model));</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(book));</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'>-	e_book_load_uri(book, uri, (EBookCallback) set_book, model);</div><div class='del'>-	g_free(uri);</div><div class='del'>-	g_free(filename);</div><div class='del'>-	table = e_table_new (header, model, SPEC);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(table), "model", model);</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_current_selection(ETable *table, int row, ESelectNames *names)</div><div class='del'>-{</div><div class='del'>-	names-&gt;currently_selected = row;</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;</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'>-</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'>-</div><div class='del'>-	e_select_names-&gt;table = E_TABLE(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'>-</div><div class='del'>-	e_select_names-&gt;currently_selected = -1;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_select_names-&gt;table), "cursor_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(set_current_selection), 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'>-	g_free(child-&gt;title);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(child-&gt;model));</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'>-	ESelectNames *e_select_names = E_SELECT_NAMES(object);</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'>-}</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'>-	ESelectNames *names = child-&gt;names;</div><div class='del'>-	int row = names-&gt;currently_selected;</div><div class='del'>-	if (row != -1) {</div><div class='del'>-		ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(names-&gt;model), row);</div><div class='del'>-		e_cardlist_model_add(E_CARDLIST_MODEL(child-&gt;model), &amp;card, 1);</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'>-void</div><div class='del'>-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id)</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'>-	GtkTable *table;</div><div class='del'>-	char *label;</div><div class='del'>-</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	GtkWidget *etable;</div><div class='del'>-	ETableHeader *header;</div><div class='del'>-	ECell *cell_left_just;</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'>-</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'>-	label = g_strdup_printf("%s -&gt;", _(name));</div><div class='del'>-	button = gtk_button_new_with_label(label);</div><div class='del'>-	g_free(label);</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'>-	model = e_cardlist_model_new();</div><div class='del'>-	header = e_table_header_new ();</div><div class='del'>-	cell_left_just = e_cell_text_new (model, NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	e_table_header_add_column (header, e_table_col_new (0, "Full Name", 1.0, 20, cell_left_just,</div><div class='del'>-							    g_str_compare, TRUE), 0);</div><div class='del'>-	etable = e_table_new (header, model, SPEC);</div><div class='del'>-</div><div class='del'>-	child-&gt;model = model;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(child-&gt;model));</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show(etable);</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach(table, etable,</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'>-</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'>-ECardList *</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'>-	ECardList *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_table_model_row_count(child-&gt;model);</div><div class='del'>-	</div><div class='del'>-	list = e_card_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_cardlist_model_get(E_CARDLIST_MODEL(child-&gt;model), i);</div><div class='del'>-		e_card_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='head'>diff --git a/addressbook/gui/component/e-select-names.h b/addressbook/gui/component/e-select-names.h<br/>deleted file mode 100644<br/>index 23780e2cf5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-select-names.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/e-select-names.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'>-/* e-select-names.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-list.h&gt;</div><div class='del'>-#include &lt;widgets/e-table/e-table.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'>-/* 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'>-</div><div class='del'>-typedef struct _ESelectNames       ESelectNames;</div><div class='del'>-typedef struct _ESelectNamesClass  ESelectNamesClass;</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'>-	ETable *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	int currently_selected;</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'>-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'>-/* Returns a ref counted list of addresses. */</div><div class='del'>-ECardList *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/ldap-server-dialog.glade b/addressbook/gui/component/ldap-server-dialog.glade<br/>deleted file mode 100644<br/>index 71090f53dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/ldap-server-dialog.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/ldap-server-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,351 +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;newserver&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;newserver&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;False&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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;ldap-server-dialog.glade.h&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;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;ldap-server-dialog&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-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;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;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table2&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;0&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;0&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;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;server-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;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;port-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;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;root-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;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;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;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;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;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;label1&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;/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.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;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'>-</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;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;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'>-	&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;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;label3&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;/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;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;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'>-</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;Root 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&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='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;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'>-  &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/ldap-server-dialog.glade.h b/addressbook/gui/component/ldap-server-dialog.glade.h<br/>deleted file mode 100644<br/>index 68b45bdb34..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/ldap-server-dialog.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/ldap-server-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Description:");</div><div class='del'>-gchar *s = N_("LDAP Server:");</div><div class='del'>-gchar *s = N_("Port Number:");</div><div class='del'>-gchar *s = N_("Root DN:");</div><div class='head'>diff --git a/addressbook/gui/component/select-names.glade b/addressbook/gui/component/select-names.glade<br/>deleted file mode 100644<br/>index 46da911228..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/select-names.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,245 +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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;select-names.glade.h&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;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;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;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;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;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;4&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;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-find&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;button-find&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Find...&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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;T_ype name or select from List:&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;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;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;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;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;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table-recipients&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;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'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;accellabel2&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Message Recipients&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;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'>-&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.glade.h b/addressbook/gui/component/select-names.glade.h<br/>deleted file mode 100644<br/>index a21ddce689..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/component/select-names.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Select Names");</div><div class='del'>-gchar *s = N_("Find...");</div><div class='del'>-gchar *s = N_("T_ype name or select from List:");</div><div class='del'>-gchar *s = N_("Message Recipients");</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 d7729421b1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-CPPFLAGS =					\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)			\</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)/widgets/e-table		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"contact-editor\"</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-categories.c		\</div><div class='del'>-	e-contact-editor-categories.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'>-</div><div class='del'>-noinst_PROGRAMS =		\</div><div class='del'>-	contact-editor-test</div><div class='del'>-</div><div class='del'>-contact_editor_test_SOURCES = 	\</div><div class='del'>-	test-editor.c</div><div class='del'>-</div><div class='del'>-contact_editor_test_LDADD =					\</div><div class='del'>-	libecontacteditor.a					\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/addressbook/ename/libename.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la			\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)					\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/widgets/e-table/libetable.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)/widgets/e-text/libetext.a		\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</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'>-	fullname.glade			\</div><div class='del'>-	categories.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(glade_DATA)		\</div><div class='del'>-	e-contact-editor-strings.h	\</div><div class='del'>-	fullname-strings.h		\</div><div class='del'>-	categories-strings.h</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/arrow.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/briefcase.png b/addressbook/gui/contact-editor/briefcase.png<br/>deleted file mode 100644<br/>index dd59b8fd39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/briefcase.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/briefcase.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/categories-strings.h b/addressbook/gui/contact-editor/categories-strings.h<br/>deleted file mode 100644<br/>index 813018a00e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/categories-strings.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/categories-strings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("categories");</div><div class='del'>-gchar *s = N_("Item(s) belong to these categories:");</div><div class='del'>-gchar *s = N_("Available Categories:");</div><div class='head'>diff --git a/addressbook/gui/contact-editor/categories.glade b/addressbook/gui/contact-editor/categories.glade<br/>deleted file mode 100644<br/>index bf78008940..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/categories.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/categories.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +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;categories&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;categories&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;False&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;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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;categories-strings.h&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;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;categories&lt;/name&gt;</div><div class='del'>-  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;categories&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;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'>-    &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;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-categories&lt;/name&gt;</div><div class='del'>-      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-      &lt;rows&gt;4&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel1&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;Item(s) belong to these categories:&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel2&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;Available Categories:&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;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-categories&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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade<br/>deleted file mode 100644<br/>index 7f11886b28..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/contact-editor.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/contact-editor.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2331 +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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-contact-editor-strings.h&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;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;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='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;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='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;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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;accellabel-fileas&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;File As:&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;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;GtkAccelLabel&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_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;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;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'>-</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'>-</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'>-</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'>-</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'>-</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;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;alignment10&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;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'>-</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;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;address-label&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;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;text-address&lt;/focus_target&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;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;B_usiness&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;alignment12&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;/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;alignment14&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;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;entry-contacts&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;/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;label34&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.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;label35&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Company:&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'>-      &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;label21&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Department:&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;label22&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;label23&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Profession:&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;label24&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;label25&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Spouse:&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;label31&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Birthday:&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;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;label30&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Assistant'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;label29&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;label32&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;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;GnomeDateEdit&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dateedit-anniversary&lt;/name&gt;</div><div class='del'>-	  &lt;show_time&gt;False&lt;/show_time&gt;</div><div class='del'>-	  &lt;use_24_format&gt;False&lt;/use_24_format&gt;</div><div class='del'>-	  &lt;week_start_monday&gt;False&lt;/week_start_monday&gt;</div><div class='del'>-	  &lt;lower_hour&gt;7&lt;/lower_hour&gt;</div><div class='del'>-	  &lt;upper_hour&gt;19&lt;/upper_hour&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;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;GnomeDateEdit&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dateedit-birthday&lt;/name&gt;</div><div class='del'>-	  &lt;show_time&gt;False&lt;/show_time&gt;</div><div class='del'>-	  &lt;use_24_format&gt;False&lt;/use_24_format&gt;</div><div class='del'>-	  &lt;week_start_monday&gt;False&lt;/week_start_monday&gt;</div><div class='del'>-	  &lt;lower_hour&gt;7&lt;/lower_hour&gt;</div><div class='del'>-	  &lt;upper_hour&gt;19&lt;/upper_hour&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;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;label33&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;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'>-      &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'>-    &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-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c<br/>deleted file mode 100644<br/>index e58162a06a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-categories.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-editor-categories.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,456 +0,0 @@</div><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-categories.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-categories.h&gt;</div><div class='del'>-#include &lt;e-table.h&gt;</div><div class='del'>-#include &lt;e-table-simple.h&gt;</div><div class='del'>-#include &lt;e-cell-text.h&gt;</div><div class='del'>-#include &lt;e-cell-checkbox.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);</div><div class='del'>-static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);</div><div class='del'>-static void e_contact_editor_categories_set_arg         (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_categories_get_arg         (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_categories_destroy         (GtkObject *object);</div><div class='del'>-static int e_contact_editor_categories_col_count (ETableModel *etc, gpointer data);</div><div class='del'>-static int e_contact_editor_categories_row_count (ETableModel *etc, gpointer data);</div><div class='del'>-static void *e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data);</div><div class='del'>-static void e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data);</div><div class='del'>-static gboolean e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data);</div><div class='del'>-static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data);</div><div class='del'>-static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data);</div><div class='del'>-static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data);</div><div class='del'>-static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data);</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_CATEGORIES</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_categories_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType contact_editor_categories_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!contact_editor_categories_type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo contact_editor_categories_info =</div><div class='del'>-			{</div><div class='del'>-				"EContactEditorCategories",</div><div class='del'>-				sizeof (EContactEditorCategories),</div><div class='del'>-				sizeof (EContactEditorCategoriesClass),</div><div class='del'>-				(GtkClassInitFunc) e_contact_editor_categories_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_contact_editor_categories_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_categories_type = gtk_type_unique (gnome_dialog_get_type (), &amp;contact_editor_categories_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return contact_editor_categories_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_categories_class_init (EContactEditorCategoriesClass *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 ("EContactEditorCategories::categories", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_CATEGORIES);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg = e_contact_editor_categories_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_contact_editor_categories_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_contact_editor_categories_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *builtin_categories[] = {</div><div class='del'>-	"Business",</div><div class='del'>-	"Competition",</div><div class='del'>-	"Favorites",</div><div class='del'>-	"Gifts",</div><div class='del'>-	"Goals/Objectives",</div><div class='del'>-	"Holiday",</div><div class='del'>-	"Holiday Cards",</div><div class='del'>-	"Hot Contacts",</div><div class='del'>-	"Ideas",</div><div class='del'>-	"International",</div><div class='del'>-	"Key Customer",</div><div class='del'>-	"Miscellaneous",</div><div class='del'>-	"Personal",</div><div class='del'>-	"Phone Calls",</div><div class='del'>-	"Status",</div><div class='del'>-	"Strategies",</div><div class='del'>-	"Suppliers",</div><div class='del'>-	"Time &amp; Expenses",</div><div class='del'>-	"VIP",</div><div class='del'>-	"Waiting",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BUILTIN_CATEGORY_COUNT (sizeof(builtin_categories) / sizeof(builtin_categories[0]))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_list_unique(EContactEditorCategories *categories, char *string)</div><div class='del'>-{</div><div class='del'>-	int k;</div><div class='del'>-	char *temp = e_strdup_strip(string);</div><div class='del'>-	char **list = categories-&gt;category_list;</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 (k = 0; k &lt; categories-&gt;list_length; k++) {</div><div class='del'>-		if (!strcmp(list[k], temp)) {</div><div class='del'>-			categories-&gt;selected_list[k] = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (k == categories-&gt;list_length) {</div><div class='del'>-		categories-&gt;selected_list[categories-&gt;list_length] = TRUE;</div><div class='del'>-		list[categories-&gt;list_length++] = temp;</div><div class='del'>-	} else {</div><div class='del'>-		g_free(temp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_parse_categories(EContactEditorCategories *categories)</div><div class='del'>-{</div><div class='del'>-	char *str = categories-&gt;categories;</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'>-	char **list;</div><div class='del'>-	int count = 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;list_length; i++)</div><div class='del'>-		g_free(categories-&gt;category_list[i]);</div><div class='del'>-	g_free(categories-&gt;category_list);</div><div class='del'>-	g_free(categories-&gt;selected_list);</div><div class='del'>-</div><div class='del'>-	for (i = 0; str[i]; i++) {</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'>-				i--;</div><div class='del'>-			break;</div><div class='del'>-		case ',':</div><div class='del'>-			count ++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	list = g_new(char *, count + 1 + BUILTIN_CATEGORY_COUNT);</div><div class='del'>-	categories-&gt;category_list = list;</div><div class='del'>-</div><div class='del'>-	categories-&gt;selected_list = g_new(gboolean, count + 1 + BUILTIN_CATEGORY_COUNT);</div><div class='del'>-</div><div class='del'>-	for (count = 0; count &lt; BUILTIN_CATEGORY_COUNT; count++) {</div><div class='del'>-		list[count] = g_strdup(builtin_categories[count]);</div><div class='del'>-		categories-&gt;selected_list[count] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	categories-&gt;list_length = count;</div><div class='del'>-</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(categories, 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(categories, copy);</div><div class='del'>-	g_free(copy);</div><div class='del'>-	e_table_model_changed(categories-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_categories_entry_change (GtkWidget *entry, </div><div class='del'>-					  EContactEditorCategories *categories)</div><div class='del'>-{</div><div class='del'>-	g_free(categories-&gt;categories);</div><div class='del'>-	categories-&gt;categories = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));</div><div class='del'>-	do_parse_categories(categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define INITIAL_SPEC "&lt;ETableSpecification no-header=\"1\"&gt;    	       \</div><div class='del'>-	&lt;columns-shown&gt;                  			       \</div><div class='del'>-		&lt;column&gt; 0 &lt;/column&gt;     			       \</div><div class='del'>-		&lt;column&gt; 1 &lt;/column&gt;     			       \</div><div class='del'>-	&lt;/columns-shown&gt;                 			       \</div><div class='del'>-	&lt;grouping&gt; &lt;leaf column=\"1\" ascending=\"1\"/&gt; &lt;/grouping&gt;    \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_categories_init (EContactEditorCategories *categories)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ECell *cell_left_just;</div><div class='del'>-	ECell *cell_checkbox;</div><div class='del'>-	ETableHeader *header;</div><div class='del'>-	ETableCol *col;</div><div class='del'>-	GtkWidget *e_table;</div><div class='del'>-</div><div class='del'>-	categories-&gt;list_length = 0;</div><div class='del'>-	categories-&gt;category_list = NULL;</div><div class='del'>-	categories-&gt;selected_list = NULL;</div><div class='del'>-	categories-&gt;categories = NULL;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(categories),</div><div class='del'>-				     GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(categories),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(categories), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/categories.glade", NULL);</div><div class='del'>-	categories-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	table = glade_xml_get_widget(gui, "table-categories");</div><div class='del'>-	gtk_widget_ref(table);</div><div class='del'>-	gtk_container_remove(GTK_CONTAINER(table-&gt;parent), table);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (categories)-&gt;vbox), table, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(table);</div><div class='del'>-</div><div class='del'>-	categories-&gt;entry = glade_xml_get_widget(gui, "entry-categories");</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(categories-&gt;entry), "changed",</div><div class='del'>-			   GTK_SIGNAL_FUNC(e_contact_editor_categories_entry_change), categories);</div><div class='del'>-</div><div class='del'>-	categories-&gt;model = e_table_simple_new(e_contact_editor_categories_col_count, </div><div class='del'>-					       e_contact_editor_categories_row_count,</div><div class='del'>-					       e_contact_editor_categories_value_at,</div><div class='del'>-					       e_contact_editor_categories_set_value_at,</div><div class='del'>-					       e_contact_editor_categories_is_cell_editable,</div><div class='del'>-					       e_contact_editor_categories_duplicate_value,</div><div class='del'>-					       e_contact_editor_categories_free_value,</div><div class='del'>-					       e_contact_editor_categories_initialize_value,</div><div class='del'>-					       e_contact_editor_categories_value_is_empty,</div><div class='del'>-					       categories);</div><div class='del'>-</div><div class='del'>-	header = e_table_header_new();</div><div class='del'>-</div><div class='del'>-	cell_checkbox = e_cell_checkbox_new();</div><div class='del'>-	col = e_table_col_new (0, "",</div><div class='del'>-			       0, 20, cell_checkbox,</div><div class='del'>-			       g_int_compare, TRUE);</div><div class='del'>-	e_table_header_add_column (header, col, 0);</div><div class='del'>-</div><div class='del'>-	cell_left_just = e_cell_text_new (categories-&gt;model, NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	col = e_table_col_new (1, "Category",</div><div class='del'>-			       1.0, 20, cell_left_just,</div><div class='del'>-			       g_str_compare, TRUE);</div><div class='del'>-	e_table_header_add_column (header, col, 1);</div><div class='del'>-</div><div class='del'>-	e_table = e_table_new (header, categories-&gt;model, INITIAL_SPEC);</div><div class='del'>-</div><div class='del'>-	gtk_object_sink(GTK_OBJECT(categories-&gt;model));</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show(e_table);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach_defaults(GTK_TABLE(table),</div><div class='del'>-				  e_table, </div><div class='del'>-				  0, 1,</div><div class='del'>-				  3, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_categories_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (categories-&gt;gui)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(categories-&gt;gui));</div><div class='del'>-</div><div class='del'>-	g_free(categories-&gt;categories);</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;list_length; i++)</div><div class='del'>-		g_free(categories-&gt;category_list[i]);</div><div class='del'>-	g_free(categories-&gt;category_list);</div><div class='del'>-	g_free(categories-&gt;selected_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_editor_categories_new (char *categories)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_categories_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"categories", categories,</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_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *e_contact_editor_categories;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories-&gt;entry), GTK_VALUE_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'>-e_contact_editor_categories_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *e_contact_editor_categories;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(e_contact_editor_categories-&gt;categories);</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'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_contact_editor_categories_col_count (ETableModel *etc, gpointer data)</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_contact_editor_categories_row_count (ETableModel *etc, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);</div><div class='del'>-	return categories-&gt;list_length;</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_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return (void *) categories-&gt;selected_list[row];</div><div class='del'>-	else</div><div class='del'>-		return categories-&gt;category_list[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'>-e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);</div><div class='del'>-	if ( col == 0 ) {</div><div class='del'>-		char **strs;</div><div class='del'>-		int i, j;</div><div class='del'>-		char *string;</div><div class='del'>-		categories-&gt;selected_list[row] = (gboolean) val;</div><div class='del'>-		strs = g_new(char *, categories-&gt;list_length + 1);</div><div class='del'>-		for (i = 0, j = 0; i &lt; categories-&gt;list_length; i++) {</div><div class='del'>-			if (categories-&gt;selected_list[i])</div><div class='del'>-				strs[j++] = categories-&gt;category_list[i];</div><div class='del'>-		}</div><div class='del'>-		strs[j] = 0;</div><div class='del'>-		string = g_strjoinv(", ", strs);</div><div class='del'>-		gtk_entry_set_text(GTK_ENTRY(categories-&gt;entry), string);</div><div class='del'>-		g_free(string);</div><div class='del'>-		g_free(strs);</div><div class='del'>-	}</div><div class='del'>-	if ( col == 1 )</div><div class='del'>-		return;</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_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return col == 0;</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_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return (void *)value;</div><div class='del'>-	else</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_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return;</div><div class='del'>-	else</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_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return NULL;</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 gboolean</div><div class='del'>-e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (col == 0)</div><div class='del'>-		return value == NULL;</div><div class='del'>-	else</div><div class='del'>-		return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.h b/addressbook/gui/contact-editor/e-contact-editor-categories.h<br/>deleted file mode 100644<br/>index 529ef71b68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-categories.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-editor-categories.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +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-categories.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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_CATEGORIES_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_CATEGORIES_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.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'>-#include &lt;widgets/e-table/e-table-model.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'>-/* EContactEditorCategories - 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_CATEGORIES_TYPE			(e_contact_editor_categories_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR_CATEGORIES(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategories))</div><div class='del'>-#define E_CONTACT_EDITOR_CATEGORIES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategoriesClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CATEGORIES(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CATEGORIES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditorCategories       EContactEditorCategories;</div><div class='del'>-typedef struct _EContactEditorCategoriesClass  EContactEditorCategoriesClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditorCategories</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'>-	char *categories;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-</div><div class='del'>-	int list_length;</div><div class='del'>-	char **category_list;</div><div class='del'>-	gboolean *selected_list;</div><div class='del'>-</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorCategoriesClass</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_categories_new(char *categories);</div><div class='del'>-GtkType    e_contact_editor_categories_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_CATEGORIES_H__ */</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 b2e598fdde..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-fullname.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-editor-fullname.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'>-/* </div><div class='del'>- * e-contact-editor-fullname.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-fullname.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'>-};</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'>-	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_free(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 (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'>-		if (e_contact_editor_fullname-&gt;name)</div><div class='del'>-			e_card_name_free(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'>-	}</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_copy(e_contact_editor_fullname-&gt;name);</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'>-			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 g_strdup(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'>-	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 409ffc72d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-fullname.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-editor-fullname.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'>-/* e-contact-editor-fullname.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-</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(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-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h<br/>deleted file mode 100644<br/>index d5ac9daf24..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-strings.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-editor-strings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("_Add");</div><div class='del'>-gchar *s = N_("_Delete");</div><div class='del'>-gchar *s = N_("Phone Types");</div><div class='del'>-gchar *s = N_("New phone type");</div><div class='del'>-gchar *s = N_("Add");</div><div class='del'>-gchar *s = N_("New phone type");</div><div class='del'>-gchar *s = N_("Contact Editor");</div><div class='del'>-gchar *s = N_("_Full Name...");</div><div class='del'>-gchar *s = N_("File As:");</div><div class='del'>-gchar *s = N_("Web page address:");</div><div class='del'>-gchar *s = N_("Wants to receive _HTML mail");</div><div class='del'>-gchar *s = N_("Address:");</div><div class='del'>-gchar *s = N_("_Business");</div><div class='del'>-gchar *s = N_("_Home");</div><div class='del'>-gchar *s = N_("Business _Fax");</div><div class='del'>-gchar *s = N_("_Mobile");</div><div class='del'>-gchar *s = N_("Primary Email");</div><div class='del'>-gchar *s = N_("B_usiness");</div><div class='del'>-gchar *s = N_("_This is the mailing address");</div><div class='del'>-gchar *s = N_("C_ontacts...");</div><div class='del'>-gchar *s = N_("Ca_tegories...");</div><div class='del'>-gchar *s = N_("_Job title:");</div><div class='del'>-gchar *s = N_("_Company:");</div><div class='del'>-gchar *s = N_("General");</div><div class='del'>-gchar *s = N_("_Department:");</div><div class='del'>-gchar *s = N_("_Office:");</div><div class='del'>-gchar *s = N_("_Profession:");</div><div class='del'>-gchar *s = N_("_Nickname:");</div><div class='del'>-gchar *s = N_("_Spouse:");</div><div class='del'>-gchar *s = N_("_Birthday:");</div><div class='del'>-gchar *s = N_("_Assistant's name:");</div><div class='del'>-gchar *s = N_("_Manager's Name:");</div><div class='del'>-gchar *s = N_("Anni_versary:");</div><div class='del'>-gchar *s = N_("No_tes:");</div><div class='del'>-gchar *s = N_("Details");</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 17a6c52119..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1701 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include &lt;e-contact-editor-fullname.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-categories.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;e-util/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	ADD_CARD,</div><div class='del'>-	COMMIT_CARD,</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 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'>-</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_CARD,</div><div class='del'>-	ARG_IS_NEW_CARD</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'>-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::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'>-</div><div class='del'>-  contact_editor_signals[ADD_CARD] =</div><div class='del'>-	  gtk_signal_new ("add_card",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),</div><div class='del'>-			  gtk_marshal_NONE__OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 1,</div><div class='del'>-			  GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_editor_signals[COMMIT_CARD] =</div><div class='del'>-	  gtk_signal_new ("commit_card",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),</div><div class='del'>-			  gtk_marshal_NONE__OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 1,</div><div class='del'>-			  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", DATADIR "/evolution/", 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'>-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int which;</div><div class='del'>-	gchar *string;</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'>-	string = gtk_entry_get_text(entry);</div><div class='del'>-	phone = e_card_phone_new();</div><div class='del'>-	phone-&gt;number = string;</div><div class='del'>-	e_card_simple_set_phone(editor-&gt;simple, editor-&gt;phone_choice[which - 1], phone);</div><div class='del'>-	phone-&gt;number = NULL;</div><div class='del'>-	e_card_phone_free(phone);</div><div class='del'>-	set_fields(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 = 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'>-</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'>-	address-&gt;data = gtk_editable_get_chars(editable, 0, -1);</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_free(address);</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-&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-&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 (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 = gtk_entry_get_text(file_as);</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 (!name) return 0;</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'>-			return i;</div><div class='del'>-		}</div><div class='del'>-		g_free(trystring);</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'>-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 (style == -1) {</div><div class='del'>-		string = g_strdup(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'>-	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'>-			string = name_to_style(editor-&gt;name, editor-&gt;company, i);</div><div class='del'>-			strings = g_list_append(strings, string);</div><div class='del'>-		}</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'>-	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'>-		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'>-	GtkWidget *file_as;</div><div class='del'>-	int style = 0;</div><div class='del'>-</div><div class='del'>-	file_as = glade_xml_get_widget(editor-&gt;gui, "entry-file-as");</div><div class='del'>-</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		style = file_as_get_style(editor);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_card_name_free(editor-&gt;name);</div><div class='del'>-	editor-&gt;name = e_card_name_from_string(gtk_entry_get_text(GTK_ENTRY(widget)));</div><div class='del'>-	</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		file_as_set_style(editor, style);</div><div class='del'>-	}</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'>-	GtkWidget *file_as;</div><div class='del'>-</div><div class='del'>-	file_as = glade_xml_get_widget(editor-&gt;gui, "entry-file-as");</div><div class='del'>-</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		style = file_as_get_style(editor);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free(editor-&gt;company);</div><div class='del'>-	</div><div class='del'>-	editor-&gt;company = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)));</div><div class='del'>-	</div><div class='del'>-	if (file_as &amp;&amp; GTK_IS_ENTRY(file_as)) {</div><div class='del'>-		file_as_set_style(editor, style);</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'>-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'>-}</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'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-	result = gnome_dialog_run_and_close (dialog);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		ECardName *name;</div><div class='del'>-		GtkWidget *fname_widget;</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'>-		e_card_name_free(editor-&gt;name);</div><div class='del'>-		editor-&gt;name = e_card_name_copy(name);</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'>-			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'>-	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;</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'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		categories = 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_contact_editor_categories_new(categories));</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-	result = gnome_dialog_run (dialog);</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'>-			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'>-	if (!entry)</div><div class='del'>-		g_free(categories);</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)</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;is_new_card)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],</div><div class='del'>-				 ce-&gt;card);</div><div class='del'>-	else</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],</div><div class='del'>-				 ce-&gt;card);</div><div class='del'>-</div><div class='del'>-	/* FIXME: should we set the ce-&gt;is_new_card here or have the client code</div><div class='del'>-	 * set the "is_new_card" argument on the contact editor object?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ce-&gt;is_new_card = FALSE;</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'>-	g_assert (ce-&gt;app != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (ce-&gt;app);</div><div class='del'>-	ce-&gt;app = NULL;</div><div class='del'>-</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'>-/* 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);</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'>-	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 as VCard", card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Menu bar */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_new_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Appointment"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Meeting Re_quest"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Mail Message"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Task"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Task _Request"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Journal Entry"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Note"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_page_setup_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Memo Style"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Define Print _Styles..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_NEW_SUBTREE (file_new_menu),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: S_end"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_ITEM (file_save_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (file_save_as_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Save Attac_hments..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Delete"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Move to Folder..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Cop_y to Folder..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Page Set_up"), file_page_setup_menu),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print Pre_view"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PRINT_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CLOSE_ITEM (file_close_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo edit_object_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE ("FIXME: what goes here?", NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo edit_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_UNDO_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_REDO_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CUT_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_COPY_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PASTE_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Paste _Special..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CLEAR_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SELECT_ALL_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Mark as U_nread"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_FIND_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Object"), edit_object_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_previous_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Fi_rst Item in Folder"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_next_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Last Item in Folder"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_toolbars_menu[] = {</div><div class='del'>-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,</div><div class='del'>-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },</div><div class='del'>-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,</div><div class='del'>-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_menu[] = {</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Pre_vious"), view_previous_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Ne_xt"), view_next_menu),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Toolbars"), view_toolbars_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo insert_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _File..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: It_em..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Object..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo format_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Font..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Paragraph..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo tools_forms_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Desi_gn This Form"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: D_esign a Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Publish _Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Pu_blish Form As..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Script _Debugger"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo tools_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Spelling..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Forms"), tools_forms_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo actions_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _New Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Contact from Same Company"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Letter to Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Message to Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New Meetin_g with Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Plan a Meeting..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Task for Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Journal Entry for Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Flag for Follow Up..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Display Map of Address"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Open Web Page"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Forward as _vCard"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo help_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE ("FIXME: fix Bonobo so it supports help items!", NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo main_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Insert"), insert_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_HELP_TREE (help_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the menu bar for the contact editor */</div><div class='del'>-static void</div><div class='del'>-create_menu (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandlerMenuItem *list;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_menubar (ce-&gt;uih);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (main_menu, ce);</div><div class='del'>-	bonobo_ui_handler_menu_add_list (ce-&gt;uih, "/", list);</div><div class='del'>-}</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 (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);</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Toolbar */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo toolbar[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Save and Close"),</div><div class='del'>-				N_("Save the appointment and close the dialog box"),</div><div class='del'>-				tb_save_and_close_cb,</div><div class='del'>-				GNOME_STOCK_PIXMAP_SAVE),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print..."),</div><div class='del'>-			       N_("Print this item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Insert File..."),</div><div class='del'>-			       N_("Insert a file as an attachment"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Recurrence..."),</div><div class='del'>-			       N_("Configure recurrence rules"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Invite Attendees..."),</div><div class='del'>-			       N_("Invite attendees to a meeting"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Delete"),</div><div class='del'>-			       N_("Delete this item"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Previous"),</div><div class='del'>-			       N_("Go to the previous item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Next"),</div><div class='del'>-			       N_("Go to the next item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Help"),</div><div class='del'>-				N_("See online help"), NULL, GNOME_STOCK_PIXMAP_HELP),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the toolbar for the contact editor */</div><div class='del'>-static void</div><div class='del'>-create_toolbar (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandlerToolbarItem *list;</div><div class='del'>-	GnomeDockItem *dock_item;</div><div class='del'>-	GtkWidget *toolbar_child;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_toolbar (ce-&gt;uih, "Toolbar");</div><div class='del'>-</div><div class='del'>-	/* Fetch the toolbar.  What a pain in the ass. */</div><div class='del'>-</div><div class='del'>-	dock_item = gnome_app_get_dock_item_by_name (GNOME_APP (ce-&gt;app), GNOME_APP_TOOLBAR_NAME);</div><div class='del'>-	g_assert (dock_item != NULL);</div><div class='del'>-</div><div class='del'>-	toolbar_child = gnome_dock_item_get_child (dock_item);</div><div class='del'>-	g_assert (toolbar_child != NULL &amp;&amp; GTK_IS_TOOLBAR (toolbar_child));</div><div class='del'>-</div><div class='del'>-	/* Turn off labels as GtkToolbar sucks */</div><div class='del'>-	gtk_toolbar_set_style (GTK_TOOLBAR (toolbar_child), GTK_TOOLBAR_ICONS);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_toolbar_parse_uiinfo_list_with_data (toolbar, ce);</div><div class='del'>-	bonobo_ui_handler_toolbar_add_list (ce-&gt;uih, "/Toolbar", list);</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'>-	close_dialog (ce);</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_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'>-</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 = NULL;</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'>-</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'>-</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'>-	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'>-	set_entry_changed_signals(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-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'>-	/* Build the menu and toolbar */</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;uih = bonobo_ui_handler_new ();</div><div class='del'>-	if (!e_contact_editor-&gt;uih) {</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'>-</div><div class='del'>-	bonobo_ui_handler_set_app (e_contact_editor-&gt;uih, GNOME_APP (e_contact_editor-&gt;app));</div><div class='del'>-</div><div class='del'>-	create_menu (e_contact_editor);</div><div class='del'>-	create_toolbar (e_contact_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 (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;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'>-	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'>-EContactEditor *</div><div class='del'>-e_contact_editor_new (ECard *card, gboolean is_new_card)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</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'>-			"card", card,</div><div class='del'>-			"is_new_card", is_new_card,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (ce-&gt;app);</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_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'>-		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'>-}</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_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'>-	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'>-#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, g_strdup(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'>-	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'>-	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'>-	}</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'>-	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'>-	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'>-}</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'>-	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'>-	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'>-}</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 = 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'>-		gtk_entry_set_text(entry, string);</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'>-</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'>-	set_address_field(editor, -1);</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 *widget;</div><div class='del'>-	</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_TEXT(widget)) {</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(widget);</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'>-			gtk_editable_insert_text(editable, address-&gt;data, strlen(address-&gt;data), &amp;position);</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'>-		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'>-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'>-};</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'>-			gtk_editable_insert_text(editable, value, strlen(value), &amp;position);</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'>-			gtk_editable_insert_text(editable, arbitrary-&gt;value, strlen(arbitrary-&gt;value), &amp;position);</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(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'>-		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'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "file_as",       &amp;file_as,</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'>-			       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'>-		/* 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_free(editor-&gt;name);</div><div class='del'>-		editor-&gt;name = e_card_name_copy(name);</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-anniversary");</div><div class='del'>-		if (anniversary &amp;&amp; widget &amp;&amp; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};</div><div class='del'>-			time_t time_val;</div><div class='del'>-			GnomeDateEdit *dateedit;</div><div class='del'>-</div><div class='del'>-			time_struct.tm_mday = anniversary-&gt;day;</div><div class='del'>-			time_struct.tm_mon = anniversary-&gt;month - 1;</div><div class='del'>-			time_struct.tm_year = anniversary-&gt;year - 1900;</div><div class='del'>-			time_val = mktime(&amp;time_struct);</div><div class='del'>-			dateedit = GNOME_DATE_EDIT(widget);</div><div class='del'>-			gnome_date_edit_set_time(dateedit, time_val);</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 (bday &amp;&amp; widget &amp;&amp; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};</div><div class='del'>-			time_t time_val;</div><div class='del'>-			GnomeDateEdit *dateedit;</div><div class='del'>-			time_struct.tm_mday = bday-&gt;day;</div><div class='del'>-			time_struct.tm_mon = bday-&gt;month - 1;</div><div class='del'>-			time_struct.tm_year = bday-&gt;year - 1900;</div><div class='del'>-			time_val = mktime(&amp;time_struct);</div><div class='del'>-			dateedit = GNOME_DATE_EDIT(widget);</div><div class='del'>-			gnome_date_edit_set_time(dateedit, time_val);</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 = gtk_editable_get_chars(editable, 0, -1);</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'>-		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 = 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'>-		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'>-		struct tm time_struct;</div><div class='del'>-		time_t time_val;</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 = gtk_editable_get_chars(editable, 0, -1);</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'>-			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;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; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));</div><div class='del'>-			gmtime_r(&amp;time_val,</div><div class='del'>-				 &amp;time_struct);</div><div class='del'>-			anniversary = g_new(ECardDate, 1);</div><div class='del'>-			anniversary-&gt;day   = time_struct.tm_mday;</div><div class='del'>-			anniversary-&gt;month = time_struct.tm_mon + 1;</div><div class='del'>-			anniversary-&gt;year  = time_struct.tm_year + 1900;</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       "anniversary", anniversary,</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; GNOME_IS_DATE_EDIT(widget)) {</div><div class='del'>-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));</div><div class='del'>-			gmtime_r(&amp;time_val,</div><div class='del'>-				 &amp;time_struct);</div><div class='del'>-			bday = g_new(ECardDate, 1);</div><div class='del'>-			bday-&gt;day   = time_struct.tm_mday;</div><div class='del'>-			bday-&gt;month = time_struct.tm_mon + 1;</div><div class='del'>-			bday-&gt;year  = time_struct.tm_year + 1900;</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       "birth_date", bday,</div><div class='del'>-				       NULL);</div><div class='del'>-		}</div><div class='del'>-	}</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 8eae2bf1b5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-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-editor.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo.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'>-</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'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIHandler *uih;</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'>-	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'>-	</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'>-</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 (* add_card) (EContactEditor *ce, ECard *card);</div><div class='del'>-	void (* commit_card) (EContactEditor *ce, ECard *card);</div><div class='del'>-	void (* editor_closed) (EContactEditor *ce);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EContactEditor *e_contact_editor_new (ECard *card, gboolean is_new_card);</div><div class='del'>-GtkType    e_contact_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_EDITOR_H__ */</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 51cb2619e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-save-as.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/e-contact-save-as.c</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.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;e-contact-save-as.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</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'>-typedef struct {</div><div class='del'>-	GtkFileSelection *filesel;</div><div class='del'>-	ECard *card;</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'>-	char *vcard = e_card_get_vcard(info-&gt;card);</div><div class='del'>-	const char *filename = gtk_file_selection_get_filename(info-&gt;filesel);</div><div class='del'>-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(info-&gt;card));</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'>-	gtk_object_unref(GTK_OBJECT(info-&gt;card));</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'>-	gtk_object_unref(GTK_OBJECT(info-&gt;card));</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_contact_save_as(char *title, ECard *card)</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'>-	info-&gt;filesel = filesel;</div><div class='del'>-	info-&gt;card = e_card_duplicate(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='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 e6af13e8fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-save-as.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-#include &lt;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'>-void</div><div class='del'>-e_contact_save_as(gchar *title, ECard *card);</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/email.png b/addressbook/gui/contact-editor/email.png<br/>deleted file mode 100644<br/>index f3ff02e343..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/email.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/email.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/fullname-strings.h b/addressbook/gui/contact-editor/fullname-strings.h<br/>deleted file mode 100644<br/>index 0c84dfdc8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fullname-strings.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/fullname-strings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Check Full Name");</div><div class='del'>-gchar *s = N_("_Title:");</div><div class='del'>-gchar *s = N_("_First:");</div><div class='del'>-gchar *s = N_("_Middle:");</div><div class='del'>-gchar *s = N_("_Last:");</div><div class='del'>-gchar *s = N_("_Suffix:");</div><div class='del'>-gchar *s = N_("\n"</div><div class='del'>-              "Mr.\n"</div><div class='del'>-              "Mrs.\n"</div><div class='del'>-              "Dr.\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("\n"</div><div class='del'>-              "Sr.\n"</div><div class='del'>-              "Jr.\n"</div><div class='del'>-              "I\n"</div><div class='del'>-              "II\n"</div><div class='del'>-              "III\n"</div><div class='del'>-              "Esq.\n"</div><div class='del'>-              "");</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 8f811c5616..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fullname.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/fullname.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,391 +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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;fullname-strings.h&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;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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel1&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel2&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel3&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel4&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;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;GtkAccelLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;accellabel5&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;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;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'>-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'>-    &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;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'>-  &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/head.png b/addressbook/gui/contact-editor/head.png<br/>deleted file mode 100644<br/>index ca00b75f92..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/head.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/head.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/netfreebusy.png b/addressbook/gui/contact-editor/netfreebusy.png<br/>deleted file mode 100644<br/>index 09ec8a2a5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/netfreebusy.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/netfreebusy.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/netmeeting.png b/addressbook/gui/contact-editor/netmeeting.png<br/>deleted file mode 100644<br/>index 4cb90c121e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/netmeeting.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/netmeeting.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/phone.png b/addressbook/gui/contact-editor/phone.png<br/>deleted file mode 100644<br/>index ebec84ba0b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/phone.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/phone.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/snailmail.png b/addressbook/gui/contact-editor/snailmail.png<br/>deleted file mode 100644<br/>index 647ae8f68c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/snailmail.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/snailmail.png</a><br/>+++ /dev/null</div>Binary files differ<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 80db2fe848..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/test-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/test-editor.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'>- * test-editor.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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@helixcode.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, Helix Code, 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 (cardstr), TRUE);</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 (cardstr), TRUE);</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-editor/web.png b/addressbook/gui/contact-editor/web.png<br/>deleted file mode 100644<br/>index 3211a11b19..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/web.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/contact-editor/web.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/minicard/.cvsignore b/addressbook/gui/minicard/.cvsignore<br/>deleted file mode 100644<br/>index 800a11cc3e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/.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'>-minicard-label-test</div><div class='del'>-minicard-test</div><div class='del'>-minicard-view-test</div><div class='del'>-reflow-test</div><div class='head'>diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am<br/>deleted file mode 100644<br/>index 0eb7946ac5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-minicard\"			\</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'>-	$(BONOBO_GNOME_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-minicard.c				\</div><div class='del'>-	e-minicard.h				\</div><div class='del'>-	e-minicard-label.c			\</div><div class='del'>-	e-minicard-label.h			\</div><div class='del'>-	e-minicard-view.c			\</div><div class='del'>-	e-minicard-view.h			\</div><div class='del'>-	e-reflow-sorted.c			\</div><div class='del'>-	e-reflow-sorted.h			\</div><div class='del'>-	e-reflow.c				\</div><div class='del'>-	e-reflow.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =				\</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'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)				\</div><div class='del'>-	libeminicard.a					\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la		\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a</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'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)						\</div><div class='del'>-	libeminicard.a							\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)						\</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)/widgets/e-table/libetable.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)/widgets/e-text/libetext.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'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)						\</div><div class='del'>-	$(BONOBO_GNOME_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)/widgets/e-table/libetable.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)/widgets/e-text/libetext.a</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'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)						\</div><div class='del'>-	$(BONOBO_GNOME_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)/widgets/e-table/libetable.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)/widgets/e-text/libetext.a</div><div class='head'>diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c<br/>deleted file mode 100644<br/>index e765a89f21..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-minicard-label.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-minicard-label.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,446 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include "e-text.h"</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas-utils.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'>-};</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'>- </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);</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'>-	}</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'>-	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'>-	static GdkFont *font = NULL;</div><div class='del'>-</div><div class='del'>-	if (font == NULL) {</div><div class='del'>-		font = gdk_font_load("lucidasans-10");</div><div class='del'>-	}</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'>-				 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", TRUE,</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_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/minicard/e-minicard-label.h b/addressbook/gui/minicard/e-minicard-label.h<br/>deleted file mode 100644<br/>index 08eb51ee53..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-minicard-label.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-minicard-label.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;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'>-/* 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'>-	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/minicard/e-minicard-view.c b/addressbook/gui/minicard/e-minicard-view.c<br/>deleted file mode 100644<br/>index 28f8243dff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-minicard-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,426 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-#include "e-minicard.h"</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-static void e_minicard_view_init		(EMinicardView		 *reflow);</div><div class='del'>-static void e_minicard_view_class_init	(EMinicardViewClass	 *klass);</div><div class='del'>-static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_destroy (GtkObject *object);</div><div class='del'>-static gboolean e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event);</div><div class='del'>-static void canvas_destroy (GtkObject *object, EMinicardView *view);</div><div class='del'>-static void disconnect_signals (EMinicardView *view);</div><div class='del'>-</div><div class='del'>-static EReflowSortedClass *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'>-};</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'>-    {</div><div class='del'>-      static const GtkTypeInfo reflow_info =</div><div class='del'>-      {</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 (e_reflow_sorted_get_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'>-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'>-	</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 (e_reflow_sorted_get_type ());</div><div class='del'>-	</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'>-	</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'>-	/* 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;book = NULL;</div><div class='del'>-	view-&gt;query = g_strdup("(contains \"full_name\" \"\")");</div><div class='del'>-	view-&gt;book_view = NULL;</div><div class='del'>-	view-&gt;get_view_idle = 0;</div><div class='del'>-	view-&gt;create_card_id = 0;</div><div class='del'>-	view-&gt;remove_card_id = 0;</div><div class='del'>-	view-&gt;modify_card_id = 0;</div><div class='del'>-	view-&gt;canvas_destroy_id = 0;</div><div class='del'>-	</div><div class='del'>-	gtk_object_set(GTK_OBJECT(view),</div><div class='del'>-		       "empty_message", _("\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'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	E_REFLOW_SORTED(view)-&gt;compare_func = (GCompareFunc) e_minicard_compare;</div><div class='del'>-	E_REFLOW_SORTED(view)-&gt;string_func  = (EReflowStringFunc) e_minicard_get_card_id;</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, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	for (; cards; cards = g_list_next(cards)) {</div><div class='del'>-		GnomeCanvasItem *item = gnome_canvas_item_new(GNOME_CANVAS_GROUP(view),</div><div class='del'>-							      e_minicard_get_type(),</div><div class='del'>-							      "card", cards-&gt;data,</div><div class='del'>-							      NULL);</div><div class='del'>-		e_reflow_add_item(E_REFLOW(view), item);</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, const GList *cards, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	for (; cards; cards = g_list_next(cards)) {</div><div class='del'>-		ECard *card = cards-&gt;data;</div><div class='del'>-		gchar *id = e_card_get_id(card);</div><div class='del'>-		GnomeCanvasItem *item = e_reflow_sorted_get_item(E_REFLOW_SORTED(view), id);</div><div class='del'>-		if (item &amp;&amp; !GTK_OBJECT_DESTROYED(item)) {</div><div class='del'>-			gnome_canvas_item_set(item,</div><div class='del'>-					      "card", card,</div><div class='del'>-					      NULL);</div><div class='del'>-			e_reflow_sorted_reorder_item(E_REFLOW_SORTED(view), 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'>-remove_card(EBookView *book_view, const char *id, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	e_reflow_sorted_remove_item(E_REFLOW_SORTED(view), id);</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'>-	EMinicardView *view = closure;</div><div class='del'>-	disconnect_signals(view);</div><div class='del'>-	if (view-&gt;book_view)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book_view));</div><div class='del'>-</div><div class='del'>-	if (!view-&gt;canvas_destroy_id)</div><div class='del'>-		view-&gt;canvas_destroy_id = </div><div class='del'>-			gtk_signal_connect(GTK_OBJECT(GNOME_CANVAS_ITEM(view)-&gt;canvas),</div><div class='del'>-					   "destroy", GTK_SIGNAL_FUNC(canvas_destroy),</div><div class='del'>-					   view);</div><div class='del'>-</div><div class='del'>-	view-&gt;book_view = book_view;</div><div class='del'>-	if (view-&gt;book_view)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(view-&gt;book_view));</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	view-&gt;create_card_id = gtk_signal_connect(GTK_OBJECT(view-&gt;book_view),</div><div class='del'>-						  "card_added",</div><div class='del'>-						  GTK_SIGNAL_FUNC(create_card),</div><div class='del'>-						  view);</div><div class='del'>-	view-&gt;remove_card_id = gtk_signal_connect(GTK_OBJECT(view-&gt;book_view),</div><div class='del'>-						  "card_removed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(remove_card),</div><div class='del'>-						  view);</div><div class='del'>-	view-&gt;modify_card_id = gtk_signal_connect(GTK_OBJECT(view-&gt;book_view),</div><div class='del'>-						  "card_changed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(modify_card),</div><div class='del'>-						  view);</div><div class='del'>-</div><div class='del'>-	g_list_foreach(E_REFLOW(view)-&gt;items, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_foreach(E_REFLOW(view)-&gt;items, (GFunc) gtk_object_destroy, NULL);</div><div class='del'>-	g_list_free(E_REFLOW(view)-&gt;items);</div><div class='del'>-	E_REFLOW(view)-&gt;items = NULL;</div><div class='del'>-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_view(EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;book &amp;&amp; view-&gt;query)</div><div class='del'>-		e_book_get_book_view(view-&gt;book, view-&gt;query, book_view_loaded, view);</div><div class='del'>-</div><div class='del'>-	view-&gt;get_view_idle = 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_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_BOOK:</div><div class='del'>-		if (view-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-		view-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-		if (view-&gt;book) {</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-			if (view-&gt;get_view_idle == 0)</div><div class='del'>-				view-&gt;get_view_idle = g_idle_add((GSourceFunc)get_view, view);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		g_free(view-&gt;query);</div><div class='del'>-		view-&gt;query = g_strdup(GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (view-&gt;get_view_idle == 0)</div><div class='del'>-			view-&gt;get_view_idle = g_idle_add((GSourceFunc)get_view, 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 *e_minicard_view;</div><div class='del'>-</div><div class='del'>-	e_minicard_view = E_MINICARD_VIEW (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_minicard_view-&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_minicard_view-&gt;query);</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;get_view_idle)</div><div class='del'>-		g_source_remove(view-&gt;get_view_idle);</div><div class='del'>-	if (view-&gt;canvas_destroy_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (GNOME_CANVAS_ITEM(view)-&gt;canvas),</div><div class='del'>-				      view-&gt;canvas_destroy_id);</div><div class='del'>-	disconnect_signals(view);</div><div class='del'>-	g_free(view-&gt;query);</div><div class='del'>-	if (view-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-	if (view-&gt;book_view)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book_view));</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'>-card_added_cb (EBook* book, EBookStatus status, const char *id,</div><div class='del'>-	    gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the add_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_add_card (book, card, card_added_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the commit_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_commit_card (book, card, card_changed_cb, NULL);</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 (EContactEditor *ce, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</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'>-			ECard *card;</div><div class='del'>-			EContactEditor *ce;</div><div class='del'>-			EBook *book;</div><div class='del'>-</div><div class='del'>-			card = e_card_new("");</div><div class='del'>-</div><div class='del'>-			gtk_object_get(GTK_OBJECT(view), "book", &amp;book, NULL);</div><div class='del'>-			g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-			ce = e_contact_editor_new (card, TRUE);</div><div class='del'>-</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (add_card_cb), book);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (commit_card_cb), book);</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_object_sink(GTK_OBJECT(card));</div><div class='del'>-		}</div><div class='del'>-		return TRUE;</div><div class='del'>-	default:</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'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disconnect_signals(EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;book_view &amp;&amp; view-&gt;create_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (view-&gt;book_view),</div><div class='del'>-				      view-&gt;create_card_id);</div><div class='del'>-	if (view-&gt;book_view &amp;&amp; view-&gt;remove_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (view-&gt;book_view),</div><div class='del'>-				      view-&gt;remove_card_id);</div><div class='del'>-	if (view-&gt;book_view &amp;&amp; view-&gt;modify_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (view-&gt;book_view),</div><div class='del'>-				      view-&gt;modify_card_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-canvas_destroy(GtkObject *object, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	disconnect_signals(view);</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'>-	if (view-&gt;book) {</div><div class='del'>-		EReflow *reflow = E_REFLOW(view);</div><div class='del'>-		GList *list;</div><div class='del'>-		for (list = reflow-&gt;items; list; list = g_list_next(list)) {</div><div class='del'>-			GnomeCanvasItem *item = list-&gt;data;</div><div class='del'>-			gboolean 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) {</div><div class='del'>-				ECard *card;</div><div class='del'>-				gtk_object_get(GTK_OBJECT(item),</div><div class='del'>-					       "card", &amp;card,</div><div class='del'>-					       NULL);</div><div class='del'>-				e_book_remove_card(view-&gt;book, card, cb, closure);</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 int</div><div class='del'>-compare_to_letter(EMinicard *card, char *letter)</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 (*letter == '1')</div><div class='del'>-		return 1;</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 strncasecmp(file_as, letter, 1);</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'>-</div><div class='del'>-void       e_minicard_view_jump_to_letter   (EMinicardView *view,</div><div class='del'>-					     char           letter)</div><div class='del'>-{</div><div class='del'>-	e_reflow_sorted_jump(E_REFLOW_SORTED(view),</div><div class='del'>-			     (GCompareFunc) compare_to_letter,</div><div class='del'>-			     &amp;letter);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/minicard/e-minicard-view.h b/addressbook/gui/minicard/e-minicard-view.h<br/>deleted file mode 100644<br/>index a166a6ade1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-minicard-view.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-minicard-view.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'>-/* e-minicard-view.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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 &lt;gnome.h&gt;</div><div class='del'>-#include "e-reflow-sorted.h"</div><div class='del'>-#include &lt;ebook/e-book.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'>-/* 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'>-	EReflowSorted 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'>-	int canvas_destroy_id;</div><div class='del'>-</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewClass</div><div class='del'>-{</div><div class='del'>-	EReflowSortedClass parent_class;</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'>-					     char           letter);</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/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c<br/>deleted file mode 100644<br/>index 4a73fc8eb4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-minicard.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,728 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include "e-text.h"</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;e-util/e-popup-menu.h&gt;</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-minicard-view.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 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 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 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_CARD</div><div class='del'>-};</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::card", GTK_TYPE_OBJECT, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_CARD);</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'>-  </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'>-</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'>-  </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'>-  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'>-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'>-</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'>-			e_canvas_item_grab_focus(item);</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'>-		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_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'>-	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;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_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'>-</div><div class='del'>-	e_minicard = E_MINICARD (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( 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_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", "grey70",</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'>-				 "font", "lucidasans-bold-10",</div><div class='del'>-				 "fill_color", "black",</div><div class='del'>-				 "text", "",</div><div class='del'>-				 NULL );</div><div class='del'>-	e_canvas_item_move_absolute(e_minicard-&gt;header_text, 6, 6);</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_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as (GtkWidget *widget, EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	e_card_simple_sync_card(minicard-&gt;simple);</div><div class='del'>-	e_contact_save_as(_("Save as VCard"), minicard-&gt;card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the add_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_add_card (book, card, card_added_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the commit_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_commit_card (book, card, card_changed_cb, NULL);</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 (EContactEditor *ce, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</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'>-	</div><div class='del'>-	e_minicard = E_MINICARD (item);</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'>-			if ( focus_event-&gt;in ) {</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;rect, </div><div class='del'>-						       "outline_color", "grey50", </div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_rect, </div><div class='del'>-						       "fill_color", "darkblue",</div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_text, </div><div class='del'>-						       "fill_color", "white",</div><div class='del'>-						       NULL );</div><div class='del'>-				e_minicard-&gt;has_focus = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				EBook *book;</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'>-				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'>-				/* Add the card in the contact editor to our ebook */</div><div class='del'>-				e_book_commit_card (book,</div><div class='del'>-						    e_minicard-&gt;card,</div><div class='del'>-						    card_changed_cb,</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'>-						       "outline_color", NULL, </div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_rect, </div><div class='del'>-						       "fill_color", "grey70",</div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_text, </div><div class='del'>-						       "fill_color", "black",</div><div class='del'>-						       NULL );</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 (event-&gt;button.button == 1) {</div><div class='del'>-			e_canvas_item_grab_focus(item);</div><div class='del'>-		} else if (event-&gt;button.button == 3) {</div><div class='del'>-			EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, {NULL, NULL, NULL, 0} };</div><div class='del'>-			e_popup_menu_run (menu, (GdkEventButton *)event, 0, e_minicard);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</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'>-			EContactEditor *ce;</div><div class='del'>-			EBook *book;</div><div class='del'>-</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'>-			g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-			ce = e_contact_editor_new (e_minicard-&gt;card, FALSE);</div><div class='del'>-</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (add_card_cb), book);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (commit_card_cb), book);</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 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'>-	if ( GTK_OBJECT_FLAGS( e_minicard ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-		GList *list;</div><div class='del'>-		</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'>-				       NULL );</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'>-</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'>-}</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'>-	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'>-			       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_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'>-	static GdkFont *font = NULL;</div><div class='del'>-</div><div class='del'>-	if (font == NULL) {</div><div class='del'>-		font = gdk_font_load("lucidasans-10");</div><div class='del'>-	}</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 (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'>-		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 &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'>-					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'>-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 strcasecmp(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='head'>diff --git a/addressbook/gui/minicard/e-minicard.h b/addressbook/gui/minicard/e-minicard.h<br/>deleted file mode 100644<br/>index 47da8110c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-minicard.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-minicard.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'>-/* e-minicard.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-</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'>-</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'>-	gboolean has_focus;</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'>-	void (* resize) (EMinicard *minicard);</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'>-char      *e_minicard_get_card_id (EMinicard *minicard);</div><div class='del'>-int        e_minicard_compare     (EMinicard *minicard1, EMinicard *minicard2);</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/minicard/e-reflow-sorted.c b/addressbook/gui/minicard/e-reflow-sorted.c<br/>deleted file mode 100644<br/>index 2d2dcee787..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-reflow-sorted.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-reflow-sorted.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,272 +0,0 @@</div><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-reflow-sorted.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;math.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "e-reflow-sorted.h"</div><div class='del'>-#include &lt;e-util/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_reflow_sorted_init		(EReflowSorted		 *card);</div><div class='del'>-static void e_reflow_sorted_class_init	(EReflowSortedClass	 *klass);</div><div class='del'>-static void e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_reflow_sorted_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_reflow_sorted_add_item(EReflow *e_reflow, GnomeCanvasItem *item);</div><div class='del'>-</div><div class='del'>-#define E_REFLOW_DIVIDER_WIDTH 2</div><div class='del'>-#define E_REFLOW_BORDER_WIDTH 7</div><div class='del'>-#define E_REFLOW_FULL_GUTTER (E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH * 2)</div><div class='del'>-</div><div class='del'>-static EReflowClass *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_COMPARE_FUNC,</div><div class='del'>-	ARG_STRING_FUNC</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_reflow_sorted_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'>-    {</div><div class='del'>-      static const GtkTypeInfo reflow_info =</div><div class='del'>-      {</div><div class='del'>-        "EReflowSorted",</div><div class='del'>-        sizeof (EReflowSorted),</div><div class='del'>-        sizeof (EReflowSortedClass),</div><div class='del'>-        (GtkClassInitFunc) e_reflow_sorted_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_reflow_sorted_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 (e_reflow_get_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'>-static void</div><div class='del'>-e_reflow_sorted_class_init (EReflowSortedClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	EReflowClass *reflow_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	reflow_class = E_REFLOW_CLASS (klass);</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (e_reflow_get_type ());</div><div class='del'>-	</div><div class='del'>-	gtk_object_add_arg_type ("EReflowSorted::compare_func", GTK_TYPE_POINTER,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_COMPARE_FUNC);</div><div class='del'>-	gtk_object_add_arg_type ("EReflowSorted::string_func", GTK_TYPE_POINTER,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_STRING_FUNC);</div><div class='del'>-	</div><div class='del'>-	reflow_class-&gt;add_item  = e_reflow_sorted_add_item;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;set_arg   = e_reflow_sorted_set_arg;</div><div class='del'>-	object_class-&gt;get_arg   = e_reflow_sorted_get_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_sorted_init (EReflowSorted *reflow)</div><div class='del'>-{</div><div class='del'>-	reflow-&gt;compare_func = NULL;</div><div class='del'>-	reflow-&gt;string_func = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EReflowSorted *e_reflow_sorted;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	e_reflow_sorted = E_REFLOW_SORTED (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_COMPARE_FUNC:</div><div class='del'>-		e_reflow_sorted-&gt;compare_func = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_STRING_FUNC:</div><div class='del'>-		e_reflow_sorted-&gt;string_func  = 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'>-static void</div><div class='del'>-e_reflow_sorted_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EReflowSorted *e_reflow_sorted;</div><div class='del'>-</div><div class='del'>-	e_reflow_sorted = E_REFLOW_SORTED (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_COMPARE_FUNC:</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = e_reflow_sorted-&gt;compare_func;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_STRING_FUNC:</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = e_reflow_sorted-&gt;string_func;</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 GList *</div><div class='del'>-e_reflow_sorted_get_list(EReflowSorted *e_reflow_sorted, const gchar *id)</div><div class='del'>-{</div><div class='del'>-	if (e_reflow_sorted-&gt;string_func) {</div><div class='del'>-		EReflow *reflow = E_REFLOW(e_reflow_sorted);</div><div class='del'>-		GList *list;</div><div class='del'>-		for (list = reflow-&gt;items; list; list = g_list_next(list)) {</div><div class='del'>-			GnomeCanvasItem *item = list-&gt;data;</div><div class='del'>-			char *string = e_reflow_sorted-&gt;string_func (item);</div><div class='del'>-			if (string &amp;&amp; !strcmp(string, id)) {</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'>-void</div><div class='del'>-e_reflow_sorted_remove_item(EReflowSorted *e_reflow_sorted, const gchar *id)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	GnomeCanvasItem *item = NULL;</div><div class='del'>-</div><div class='del'>-	list = e_reflow_sorted_get_list(e_reflow_sorted, id);</div><div class='del'>-	if (list)</div><div class='del'>-		item = list-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (item) {</div><div class='del'>-		EReflow *reflow = E_REFLOW(e_reflow_sorted);</div><div class='del'>-		reflow-&gt;items = g_list_remove_link(reflow-&gt;items, list);</div><div class='del'>-		g_list_free_1(list);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(item));</div><div class='del'>-		gtk_object_destroy(GTK_OBJECT(item));</div><div class='del'>-		if ( GTK_OBJECT_FLAGS( e_reflow_sorted ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-			e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_reflow_sorted));</div><div class='del'>-			e_reflow_post_add_item(E_REFLOW(e_reflow_sorted), NULL);</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_reflow_sorted_replace_item(EReflowSorted *e_reflow_sorted, GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	if (e_reflow_sorted-&gt;string_func) {</div><div class='del'>-		char *string = e_reflow_sorted-&gt;string_func (item);</div><div class='del'>-		e_reflow_sorted_remove_item(e_reflow_sorted, string);</div><div class='del'>-		e_reflow_sorted_add_item(E_REFLOW(e_reflow_sorted), item);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCanvasItem *</div><div class='del'>-e_reflow_sorted_get_item(EReflowSorted *e_reflow_sorted, const gchar *id)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	list = e_reflow_sorted_get_list(e_reflow_sorted, id);</div><div class='del'>-	if (list)</div><div class='del'>-		return list-&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'>-void</div><div class='del'>-e_reflow_sorted_reorder_item(EReflowSorted *e_reflow_sorted, const gchar *id)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	GnomeCanvasItem *item = NULL;</div><div class='del'>-</div><div class='del'>-	list = e_reflow_sorted_get_list(e_reflow_sorted, id);</div><div class='del'>-	if (list)</div><div class='del'>-		item = list-&gt;data;</div><div class='del'>-	if (item) {</div><div class='del'>-		EReflow *reflow = E_REFLOW(e_reflow_sorted);</div><div class='del'>-		reflow-&gt;items = g_list_remove_link(reflow-&gt;items, list);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(item));</div><div class='del'>-		g_list_free_1(list);</div><div class='del'>-		e_reflow_sorted_add_item(reflow, item);</div><div class='del'>-		e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_reflow_sorted));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_sorted_add_item(EReflow *reflow, GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	EReflowSorted *e_reflow_sorted = E_REFLOW_SORTED(reflow);</div><div class='del'>-	if ( e_reflow_sorted-&gt;compare_func ) {</div><div class='del'>-		reflow-&gt;items = g_list_insert_sorted(reflow-&gt;items, item, e_reflow_sorted-&gt;compare_func);</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(item));</div><div class='del'>-</div><div class='del'>-		if ( GTK_OBJECT_FLAGS( e_reflow_sorted ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-			gnome_canvas_item_set(item,</div><div class='del'>-					      "width", (double) reflow-&gt;column_width,</div><div class='del'>-					      NULL);</div><div class='del'>-</div><div class='del'>-			e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_reflow_sorted));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	e_reflow_post_add_item(reflow, item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void e_reflow_sorted_jump   (EReflowSorted *sorted,</div><div class='del'>-			     GCompareFunc   compare_func,</div><div class='del'>-			     void          *value)</div><div class='del'>-{</div><div class='del'>-	int columns = 0;</div><div class='del'>-	EReflow *reflow = E_REFLOW(sorted);</div><div class='del'>-	GList *list;</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-</div><div class='del'>-	for (list = reflow-&gt;columns; list; list = g_list_next(list)) {</div><div class='del'>-		if (compare_func(((GList *)list-&gt;data)-&gt;data, value) &gt;= 0) {</div><div class='del'>-			GList *last = list-&gt;prev;</div><div class='del'>-			if (last) {</div><div class='del'>-				GList *walk;</div><div class='del'>-				for (walk = last-&gt;data; walk != list-&gt;data; walk = g_list_next(walk)) {</div><div class='del'>-					if (compare_func(walk-&gt;data, value) &gt;= 0) {</div><div class='del'>-						columns --;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(sorted)-&gt;canvas));</div><div class='del'>-			gtk_adjustment_set_value(adjustment, (reflow-&gt;column_width + E_REFLOW_FULL_GUTTER) * columns);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		columns ++;</div><div class='del'>-	}</div><div class='del'>-	columns --;</div><div class='del'>-	adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(sorted)-&gt;canvas));</div><div class='del'>-	gtk_adjustment_set_value(adjustment, (reflow-&gt;column_width + E_REFLOW_FULL_GUTTER) * columns);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/minicard/e-reflow-sorted.h b/addressbook/gui/minicard/e-reflow-sorted.h<br/>deleted file mode 100644<br/>index 7adfa2c045..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-reflow-sorted.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-reflow-sorted.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'>-/* e-reflow-sorted.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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_REFLOW_SORTED_H__</div><div class='del'>-#define __E_REFLOW_SORTED_H__</div><div class='del'>-</div><div class='del'>-#include &lt;e-reflow.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'>-/* EReflowSorted - 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'>- * 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_REFLOW_SORTED_TYPE			(e_reflow_sorted_get_type ())</div><div class='del'>-#define E_REFLOW_SORTED(obj)			(GTK_CHECK_CAST ((obj), E_REFLOW_SORTED_TYPE, EReflowSorted))</div><div class='del'>-#define E_REFLOW_SORTED_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_REFLOW_SORTED_TYPE, EReflowSortedClass))</div><div class='del'>-#define E_IS_REFLOW_SORTED(obj) 		(GTK_CHECK_TYPE ((obj), E_REFLOW_SORTED_TYPE))</div><div class='del'>-#define E_IS_REFLOW_SORTED_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_REFLOW_SORTED_TYPE))</div><div class='del'>-</div><div class='del'>-typedef char * (* EReflowStringFunc) (GnomeCanvasItem *);</div><div class='del'>-</div><div class='del'>-typedef struct _EReflowSorted       EReflowSorted;</div><div class='del'>-typedef struct _EReflowSortedClass  EReflowSortedClass;</div><div class='del'>-</div><div class='del'>-/* FIXME: Try reimplementing this as a hash table with key as string</div><div class='del'>-   and change EReflow to use a GTree. */</div><div class='del'>-struct _EReflowSorted</div><div class='del'>-{</div><div class='del'>-	EReflow parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GCompareFunc      compare_func;</div><div class='del'>-	EReflowStringFunc string_func;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EReflowSortedClass</div><div class='del'>-{</div><div class='del'>-	EReflowClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * To be added to a reflow, an item must have the argument "width" as</div><div class='del'>- * a Read/Write argument and "height" as a Read Only argument.  It</div><div class='del'>- * should also do an ECanvas parent reflow request if its size</div><div class='del'>- * changes.</div><div class='del'>- */</div><div class='del'>-void         	 e_reflow_sorted_remove_item  (EReflowSorted *sorted, const char *id);</div><div class='del'>-void         	 e_reflow_sorted_replace_item (EReflowSorted *sorted, GnomeCanvasItem *item);</div><div class='del'>-void         	 e_reflow_sorted_reorder_item (EReflowSorted *e_reflow_sorted, const gchar *id);</div><div class='del'>-GnomeCanvasItem *e_reflow_sorted_get_item     (EReflowSorted *e_reflow_sorted, const gchar *id);</div><div class='del'>-GtkType          e_reflow_sorted_get_type     (void);</div><div class='del'>-void             e_reflow_sorted_jump         (EReflowSorted *sorted, GCompareFunc compare_func, void          *value);</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_REFLOW_SORTED_H__ */</div><div class='head'>diff --git a/addressbook/gui/minicard/e-reflow.c b/addressbook/gui/minicard/e-reflow.c<br/>deleted file mode 100644<br/>index ba7bf36c4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-reflow.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-reflow.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,848 +0,0 @@</div><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-reflow.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include "e-reflow.h"</div><div class='del'>-#include "e-text.h"</div><div class='del'>-#include &lt;e-util/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_reflow_init		(EReflow		 *reflow);</div><div class='del'>-static void e_reflow_class_init	(EReflowClass	 *klass);</div><div class='del'>-static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_reflow_destroy (GtkObject *object);</div><div class='del'>-static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event);</div><div class='del'>-static void e_reflow_realize (GnomeCanvasItem *item);</div><div class='del'>-static void e_reflow_unrealize (GnomeCanvasItem *item);</div><div class='del'>-static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,</div><div class='del'>-				    int x, int y, int width, int height);</div><div class='del'>-static void e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags);</div><div class='del'>-static double e_reflow_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);</div><div class='del'>-static void e_reflow_reflow (GnomeCanvasItem *item, int flags);</div><div class='del'>-static void e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item);</div><div class='del'>-static void set_empty(EReflow *e_reflow);</div><div class='del'>-</div><div class='del'>-static void e_reflow_resize_children (GnomeCanvasItem *item);</div><div class='del'>-</div><div class='del'>-#define E_REFLOW_DIVIDER_WIDTH 2</div><div class='del'>-#define E_REFLOW_BORDER_WIDTH 7</div><div class='del'>-#define E_REFLOW_FULL_GUTTER (E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH * 2)</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_MINIMUM_WIDTH,</div><div class='del'>-	ARG_WIDTH,</div><div class='del'>-	ARG_HEIGHT,</div><div class='del'>-	ARG_EMPTY_MESSAGE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_reflow_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'>-    {</div><div class='del'>-      static const GtkTypeInfo reflow_info =</div><div class='del'>-      {</div><div class='del'>-        "EReflow",</div><div class='del'>-        sizeof (EReflow),</div><div class='del'>-        sizeof (EReflowClass),</div><div class='del'>-        (GtkClassInitFunc) e_reflow_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_reflow_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 (gnome_canvas_group_get_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'>-static void</div><div class='del'>-e_reflow_class_init (EReflowClass *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 ("EReflow::minimum_width", GTK_TYPE_DOUBLE, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH); </div><div class='del'>-	gtk_object_add_arg_type ("EReflow::width", GTK_TYPE_DOUBLE, </div><div class='del'>-				 GTK_ARG_READABLE, ARG_WIDTH); </div><div class='del'>-	gtk_object_add_arg_type ("EReflow::height", GTK_TYPE_DOUBLE, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_HEIGHT);</div><div class='del'>-	gtk_object_add_arg_type ("EReflow::empty_message", GTK_TYPE_STRING, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EMPTY_MESSAGE);</div><div class='del'>-</div><div class='del'>-	klass-&gt;add_item       = e_reflow_real_add_item;</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg   = e_reflow_set_arg;</div><div class='del'>-	object_class-&gt;get_arg   = e_reflow_get_arg;</div><div class='del'>-	object_class-&gt;destroy   = e_reflow_destroy;</div><div class='del'>-  </div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;event       = e_reflow_event;</div><div class='del'>-	item_class-&gt;realize     = e_reflow_realize;</div><div class='del'>-	item_class-&gt;unrealize   = e_reflow_unrealize;</div><div class='del'>-	item_class-&gt;draw        = e_reflow_draw;</div><div class='del'>-	item_class-&gt;update      = e_reflow_update;</div><div class='del'>-	item_class-&gt;point       = e_reflow_point;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_init (EReflow *reflow)</div><div class='del'>-{</div><div class='del'>-	reflow-&gt;items = NULL;</div><div class='del'>-	reflow-&gt;columns = NULL;</div><div class='del'>-	reflow-&gt;column_width = 150;</div><div class='del'>-</div><div class='del'>-	reflow-&gt;minimum_width = 10;</div><div class='del'>-	reflow-&gt;width = 10;</div><div class='del'>-	reflow-&gt;height = 10;</div><div class='del'>-	reflow-&gt;idle = 0;</div><div class='del'>-</div><div class='del'>-	reflow-&gt;empty_message = NULL;</div><div class='del'>-	reflow-&gt;empty_text = NULL;</div><div class='del'>-</div><div class='del'>-	reflow-&gt;column_drag = FALSE;</div><div class='del'>-</div><div class='del'>-	reflow-&gt;need_height_update = FALSE;</div><div class='del'>-	reflow-&gt;need_column_resize = FALSE;</div><div class='del'>-</div><div class='del'>-	reflow-&gt;default_cursor_shown = TRUE;</div><div class='del'>-	reflow-&gt;arrow_cursor = NULL;</div><div class='del'>-	reflow-&gt;default_cursor = NULL;</div><div class='del'>-</div><div class='del'>-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(reflow), e_reflow_reflow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EReflow *e_reflow;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	e_reflow = E_REFLOW (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-		e_reflow-&gt;height = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		e_canvas_item_request_reflow(item);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MINIMUM_WIDTH:</div><div class='del'>-		e_reflow-&gt;minimum_width = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		if (GNOME_CANVAS_ITEM_REALIZED &amp; GTK_OBJECT_FLAGS(o))</div><div class='del'>-			set_empty(e_reflow);</div><div class='del'>-		e_canvas_item_request_reflow(item);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EMPTY_MESSAGE:</div><div class='del'>-		g_free(e_reflow-&gt;empty_message);</div><div class='del'>-		e_reflow-&gt;empty_message = g_strdup(GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (GNOME_CANVAS_ITEM_REALIZED &amp; GTK_OBJECT_FLAGS(o))</div><div class='del'>-			set_empty(e_reflow);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EReflow *e_reflow;</div><div class='del'>-</div><div class='del'>-	e_reflow = E_REFLOW (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_MINIMUM_WIDTH:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = e_reflow-&gt;minimum_width;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = e_reflow-&gt;width;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = e_reflow-&gt;height;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EMPTY_MESSAGE:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(e_reflow-&gt;empty_message);</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_reflow_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EReflow *reflow = E_REFLOW(object);</div><div class='del'>-</div><div class='del'>-	g_list_foreach(reflow-&gt;items, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free(reflow-&gt;items);</div><div class='del'>-	reflow-&gt;items = NULL;</div><div class='del'>-	</div><div class='del'>-	g_free(reflow-&gt;empty_message);</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'>-e_reflow_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	EReflow *e_reflow;</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	GList *list;</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-</div><div class='del'>-	e_reflow = E_REFLOW (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( 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_reflow-&gt;arrow_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);</div><div class='del'>-	e_reflow-&gt;default_cursor = gdk_cursor_new (GDK_LEFT_PTR);</div><div class='del'>-</div><div class='del'>-	for(list = e_reflow-&gt;items; list; list = g_list_next(list)) {</div><div class='del'>-		GnomeCanvasItem *item = GNOME_CANVAS_ITEM(list-&gt;data);</div><div class='del'>-		gnome_canvas_item_set(item,</div><div class='del'>-				      "width", (double) e_reflow-&gt;column_width,</div><div class='del'>-				      NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_empty(e_reflow);</div><div class='del'>-</div><div class='del'>-	e_canvas_item_request_reflow(item);</div><div class='del'>-	</div><div class='del'>-	adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas));</div><div class='del'>-	adjustment-&gt;step_increment = (e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER) / 2;</div><div class='del'>-	adjustment-&gt;page_increment = adjustment-&gt;page_size - adjustment-&gt;step_increment;</div><div class='del'>-	gtk_adjustment_changed(adjustment);</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_reflow_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  EReflow *e_reflow;</div><div class='del'>-</div><div class='del'>-  e_reflow = E_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'>-  gdk_cursor_destroy (e_reflow-&gt;arrow_cursor);</div><div class='del'>-  gdk_cursor_destroy (e_reflow-&gt;default_cursor);</div><div class='del'>-  e_reflow-&gt;arrow_cursor = NULL;</div><div class='del'>-  e_reflow-&gt;default_cursor = NULL;</div><div class='del'>-</div><div class='del'>-  g_list_free (e_reflow-&gt;columns);</div><div class='del'>-  e_reflow-&gt;columns = 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'>-static gint</div><div class='del'>-e_reflow_pick_line (EReflow *e_reflow, double x)</div><div class='del'>-{</div><div class='del'>-	x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-	x /= e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER;</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EReflow *e_reflow;</div><div class='del'>- </div><div class='del'>-	e_reflow = E_REFLOW (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_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_reflow-&gt;items; list; list = list-&gt;next) {</div><div class='del'>-					GnomeCanvasItem *item = GNOME_CANVAS_ITEM (list-&gt;data);</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) {</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'>-							item = GNOME_CANVAS_ITEM(list-&gt;data);</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'>-			break;</div><div class='del'>-		case GDK_BUTTON_PRESS:</div><div class='del'>-			switch(event-&gt;button.button) </div><div class='del'>-				{</div><div class='del'>-				case 1:</div><div class='del'>-					{</div><div class='del'>-						GdkEventButton *button = (GdkEventButton *) event;</div><div class='del'>-						double n_x;</div><div class='del'>-						n_x = button-&gt;x;</div><div class='del'>-						n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-						n_x = fmod(n_x,(e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER));</div><div class='del'>-						if ( button-&gt;y &gt;= E_REFLOW_BORDER_WIDTH &amp;&amp; button-&gt;y &lt;= e_reflow-&gt;height - E_REFLOW_BORDER_WIDTH &amp;&amp; n_x &lt; E_REFLOW_FULL_GUTTER ) {</div><div class='del'>-							e_reflow-&gt;which_column_dragged = e_reflow_pick_line(e_reflow, button-&gt;x);</div><div class='del'>-							e_reflow-&gt;start_x = e_reflow-&gt;which_column_dragged * (e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER) - E_REFLOW_DIVIDER_WIDTH / 2;</div><div class='del'>-							e_reflow-&gt;temp_column_width = e_reflow-&gt;column_width;</div><div class='del'>-							e_reflow-&gt;column_drag = TRUE;</div><div class='del'>-						  </div><div class='del'>-							gnome_canvas_item_grab (item, </div><div class='del'>-										GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,</div><div class='del'>-										e_reflow-&gt;arrow_cursor,</div><div class='del'>-										button-&gt;time);</div><div class='del'>-						  </div><div class='del'>-							e_reflow-&gt;previous_temp_column_width = -1;</div><div class='del'>-							e_reflow-&gt;need_column_resize = TRUE;</div><div class='del'>-							gnome_canvas_item_request_update(item);</div><div class='del'>-							return TRUE;</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-					break;</div><div class='del'>-				case 4:</div><div class='del'>-					{</div><div class='del'>-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas));</div><div class='del'>-						gdouble new_value = adjustment-&gt;value;</div><div class='del'>-						new_value -= adjustment-&gt;step_increment;</div><div class='del'>-						gtk_adjustment_set_value(adjustment, new_value);</div><div class='del'>-					}</div><div class='del'>-					break;</div><div class='del'>-				case 5: </div><div class='del'>-					{</div><div class='del'>-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas));</div><div class='del'>-						gdouble new_value = adjustment-&gt;value;</div><div class='del'>-						new_value += adjustment-&gt;step_increment;</div><div class='del'>-						if ( new_value &gt; adjustment-&gt;upper - adjustment-&gt;page_size )</div><div class='del'>-							new_value = adjustment-&gt;upper - adjustment-&gt;page_size;</div><div class='del'>-						gtk_adjustment_set_value(adjustment, new_value);</div><div class='del'>-					}</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		case GDK_BUTTON_RELEASE:</div><div class='del'>-			if (e_reflow-&gt;column_drag) {</div><div class='del'>-				gdouble old_width = e_reflow-&gt;column_width;</div><div class='del'>-				GdkEventButton *button = (GdkEventButton *) event;</div><div class='del'>-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas));</div><div class='del'>-				e_reflow-&gt;temp_column_width = e_reflow-&gt;column_width +</div><div class='del'>-					(button-&gt;x - e_reflow-&gt;start_x)/(e_reflow-&gt;which_column_dragged - e_reflow_pick_line(e_reflow, adjustment-&gt;value));</div><div class='del'>-				if ( e_reflow-&gt;temp_column_width &lt; 50 )</div><div class='del'>-					e_reflow-&gt;temp_column_width = 50;</div><div class='del'>-				e_reflow-&gt;column_drag = FALSE;</div><div class='del'>-				if ( old_width != e_reflow-&gt;temp_column_width ) {</div><div class='del'>-					gtk_adjustment_set_value(adjustment, adjustment-&gt;value + e_reflow_pick_line(e_reflow, adjustment-&gt;value) * (e_reflow-&gt;temp_column_width - e_reflow-&gt;column_width));</div><div class='del'>-					e_reflow-&gt;column_width = e_reflow-&gt;temp_column_width;</div><div class='del'>-					adjustment-&gt;step_increment = (e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER) / 2;</div><div class='del'>-					adjustment-&gt;page_increment = adjustment-&gt;page_size - adjustment-&gt;step_increment;</div><div class='del'>-					gtk_adjustment_changed(adjustment);</div><div class='del'>-					e_reflow_resize_children(item);</div><div class='del'>-					e_canvas_item_request_reflow(item);</div><div class='del'>-				}</div><div class='del'>-				e_reflow-&gt;need_column_resize = TRUE;</div><div class='del'>-				gnome_canvas_item_request_update(item);</div><div class='del'>-				gnome_canvas_item_ungrab (item, button-&gt;time);</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case GDK_MOTION_NOTIFY:</div><div class='del'>-			if (e_reflow-&gt;column_drag) {</div><div class='del'>-				double old_width = e_reflow-&gt;temp_column_width;</div><div class='del'>-				GdkEventMotion *motion = (GdkEventMotion *) event;</div><div class='del'>-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas));</div><div class='del'>-				e_reflow-&gt;temp_column_width = e_reflow-&gt;column_width +</div><div class='del'>-					(motion-&gt;x - e_reflow-&gt;start_x)/(e_reflow-&gt;which_column_dragged - e_reflow_pick_line(e_reflow, adjustment-&gt;value));</div><div class='del'>-				if (e_reflow-&gt;temp_column_width &lt; 50)</div><div class='del'>-					e_reflow-&gt;temp_column_width = 50;</div><div class='del'>-				if (old_width != e_reflow-&gt;temp_column_width) {</div><div class='del'>-					e_reflow-&gt;need_column_resize = TRUE;</div><div class='del'>-					gnome_canvas_item_request_update(item);</div><div class='del'>-				}</div><div class='del'>-				return TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				GdkEventMotion *motion = (GdkEventMotion *) event;</div><div class='del'>-				double n_x;</div><div class='del'>-				n_x = motion-&gt;x;</div><div class='del'>-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-				n_x = fmod(n_x,(e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER));</div><div class='del'>-				if ( motion-&gt;y &gt;= E_REFLOW_BORDER_WIDTH &amp;&amp; motion-&gt;y &lt;= e_reflow-&gt;height - E_REFLOW_BORDER_WIDTH &amp;&amp; n_x &lt; E_REFLOW_FULL_GUTTER ) {</div><div class='del'>-					if ( e_reflow-&gt;default_cursor_shown ) {</div><div class='del'>-						gdk_window_set_cursor(GTK_WIDGET(item-&gt;canvas)-&gt;window, e_reflow-&gt;arrow_cursor);</div><div class='del'>-						e_reflow-&gt;default_cursor_shown = FALSE;</div><div class='del'>-					}</div><div class='del'>-				} else </div><div class='del'>-					if ( ! e_reflow-&gt;default_cursor_shown ) {</div><div class='del'>-						gdk_window_set_cursor(GTK_WIDGET(item-&gt;canvas)-&gt;window, e_reflow-&gt;default_cursor);</div><div class='del'>-						e_reflow-&gt;default_cursor_shown = TRUE;</div><div class='del'>-					}</div><div class='del'>-			    </div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case GDK_ENTER_NOTIFY:</div><div class='del'>-			if (!e_reflow-&gt;column_drag) {</div><div class='del'>-				GdkEventCrossing *crossing = (GdkEventCrossing *) event;</div><div class='del'>-				double n_x;</div><div class='del'>-				n_x = crossing-&gt;x;</div><div class='del'>-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-				n_x = fmod(n_x,(e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER));</div><div class='del'>-				if ( crossing-&gt;y &gt;= E_REFLOW_BORDER_WIDTH &amp;&amp; crossing-&gt;y &lt;= e_reflow-&gt;height - E_REFLOW_BORDER_WIDTH &amp;&amp; n_x &lt; E_REFLOW_FULL_GUTTER ) {</div><div class='del'>-					if ( e_reflow-&gt;default_cursor_shown ) {</div><div class='del'>-						gdk_window_set_cursor(GTK_WIDGET(item-&gt;canvas)-&gt;window, e_reflow-&gt;arrow_cursor);</div><div class='del'>-						e_reflow-&gt;default_cursor_shown = FALSE;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case GDK_LEAVE_NOTIFY:</div><div class='del'>-			if (!e_reflow-&gt;column_drag) {</div><div class='del'>-				GdkEventCrossing *crossing = (GdkEventCrossing *) event;</div><div class='del'>-				double n_x;</div><div class='del'>-				n_x = crossing-&gt;x;</div><div class='del'>-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-				n_x = fmod(n_x,(e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER));</div><div class='del'>-				if ( !( crossing-&gt;y &gt;= E_REFLOW_BORDER_WIDTH &amp;&amp; crossing-&gt;y &lt;= e_reflow-&gt;height - E_REFLOW_BORDER_WIDTH &amp;&amp; n_x &lt; E_REFLOW_FULL_GUTTER ) ) {</div><div class='del'>-					if ( ! e_reflow-&gt;default_cursor_shown ) {</div><div class='del'>-						gdk_window_set_cursor(GTK_WIDGET(item-&gt;canvas)-&gt;window, e_reflow-&gt;default_cursor);</div><div class='del'>-						e_reflow-&gt;default_cursor_shown = TRUE;</div><div class='del'>-					}</div><div class='del'>-				}</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 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	e_reflow-&gt;items = g_list_append(e_reflow-&gt;items, item);</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(item));</div><div class='del'>-	if ( GTK_OBJECT_FLAGS( e_reflow ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-		gnome_canvas_item_set(item,</div><div class='del'>-				      "width", (double) e_reflow-&gt;column_width,</div><div class='del'>-				      NULL);</div><div class='del'>-		e_reflow_post_add_item(e_reflow, item);</div><div class='del'>-		e_canvas_item_request_reflow(item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,</div><div class='del'>-				    int x, int y, int width, int height)</div><div class='del'>-{</div><div class='del'>-	int x_rect, y_rect, width_rect, height_rect;</div><div class='del'>-	gdouble running_width;</div><div class='del'>-	EReflow *e_reflow = E_REFLOW(item);</div><div class='del'>-	int i;</div><div class='del'>-	double column_width;</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'>-	column_width = e_reflow-&gt;column_width;</div><div class='del'>-	running_width = E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-	x_rect = running_width;</div><div class='del'>-	y_rect = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-	width_rect = E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-	height_rect = e_reflow-&gt;height - (E_REFLOW_BORDER_WIDTH * 2);</div><div class='del'>-</div><div class='del'>-	/* Compute first column to draw. */</div><div class='del'>-	i = x;</div><div class='del'>-	i /= column_width + E_REFLOW_FULL_GUTTER;</div><div class='del'>-	running_width += i * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-</div><div class='del'>-	for ( ; i &lt; e_reflow-&gt;column_count; i++) {</div><div class='del'>-		if ( running_width &gt; x + width )</div><div class='del'>-			break;</div><div class='del'>-		x_rect = running_width;</div><div class='del'>-		gtk_paint_flat_box(GTK_WIDGET(item-&gt;canvas)-&gt;style,</div><div class='del'>-				   drawable,</div><div class='del'>-				   GTK_STATE_ACTIVE,</div><div class='del'>-				   GTK_SHADOW_NONE,</div><div class='del'>-				   NULL,</div><div class='del'>-				   GTK_WIDGET(item-&gt;canvas),</div><div class='del'>-				   "reflow",</div><div class='del'>-				   x_rect - x,</div><div class='del'>-				   y_rect - y,</div><div class='del'>-				   width_rect,</div><div class='del'>-				   height_rect);</div><div class='del'>-		running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-	}</div><div class='del'>-	if (e_reflow-&gt;column_drag) {</div><div class='del'>-		int start_line = e_reflow_pick_line(e_reflow,</div><div class='del'>-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas))-&gt;value); </div><div class='del'>-		i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-		running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-		column_width = e_reflow-&gt;temp_column_width;</div><div class='del'>-		running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-		i += start_line * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-		running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-		x_rect = running_width;</div><div class='del'>-		y_rect = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-		width_rect = E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-		height_rect = e_reflow-&gt;height - (E_REFLOW_BORDER_WIDTH * 2);</div><div class='del'>-</div><div class='del'>-		/* Compute first column to draw. */</div><div class='del'>-		i /= column_width + E_REFLOW_FULL_GUTTER;</div><div class='del'>-		running_width += i * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-		</div><div class='del'>-		for ( ; i &lt; e_reflow-&gt;column_count; i++) {</div><div class='del'>-			if ( running_width &gt; x + width )</div><div class='del'>-				break;</div><div class='del'>-			x_rect = running_width;</div><div class='del'>-			gdk_draw_rectangle(drawable,</div><div class='del'>-					   GTK_WIDGET(item-&gt;canvas)-&gt;style-&gt;fg_gc[GTK_STATE_NORMAL],</div><div class='del'>-					   TRUE,</div><div class='del'>-					   x_rect - x,</div><div class='del'>-					   y_rect - y,</div><div class='del'>-					   width_rect - 1,</div><div class='del'>-					   height_rect - 1);					   </div><div class='del'>-			running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</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_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags)</div><div class='del'>-{</div><div class='del'>-	EReflow *e_reflow;</div><div class='del'>-	double x0, x1, y0, y1;</div><div class='del'>-</div><div class='del'>-	e_reflow = E_REFLOW (item);</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'>-	x0 = item-&gt;x1;</div><div class='del'>-	y0 = item-&gt;y1;</div><div class='del'>-	x1 = item-&gt;x2;</div><div class='del'>-	y1 = item-&gt;y2;</div><div class='del'>-	if ( x1 &lt; x0 + e_reflow-&gt;width )</div><div class='del'>-		x1 = x0 + e_reflow-&gt;width;</div><div class='del'>-	if ( y1 &lt; y0 + e_reflow-&gt;height )</div><div class='del'>-		y1 = y0 + e_reflow-&gt;height;</div><div class='del'>-	item-&gt;x2 = x1;</div><div class='del'>-	item-&gt;y2 = y1;</div><div class='del'>-</div><div class='del'>-	if (e_reflow-&gt;need_height_update) {</div><div class='del'>-		x0 = item-&gt;x1;</div><div class='del'>-		y0 = item-&gt;y1;</div><div class='del'>-		x1 = item-&gt;x2;</div><div class='del'>-		y1 = item-&gt;y2;</div><div class='del'>-		if ( x0 &gt; 0 )</div><div class='del'>-			x0 = 0;</div><div class='del'>-		if ( y0 &gt; 0 )</div><div class='del'>-			y0 = 0;</div><div class='del'>-		if ( x1 &lt; E_REFLOW(item)-&gt;width )</div><div class='del'>-			x1 = E_REFLOW(item)-&gt;width;</div><div class='del'>-		if ( x1 &lt; E_REFLOW(item)-&gt;height )</div><div class='del'>-			x1 = E_REFLOW(item)-&gt;height;</div><div class='del'>-</div><div class='del'>-		gnome_canvas_request_redraw(item-&gt;canvas, x0, y0, x1, y1);</div><div class='del'>-		e_reflow-&gt;need_height_update = FALSE;</div><div class='del'>-	} else if (e_reflow-&gt;need_column_resize) {</div><div class='del'>-		int x_rect, y_rect, width_rect, height_rect;</div><div class='del'>-		int start_line = e_reflow_pick_line(e_reflow,</div><div class='del'>-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item-&gt;canvas))-&gt;value); </div><div class='del'>-		gdouble running_width;</div><div class='del'>-		int i;</div><div class='del'>-		double column_width;</div><div class='del'>-		</div><div class='del'>-		if ( e_reflow-&gt;previous_temp_column_width != -1 ) {</div><div class='del'>-			running_width = start_line * (e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-			column_width = e_reflow-&gt;previous_temp_column_width;</div><div class='del'>-			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-			running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			y_rect = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			width_rect = E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-			height_rect = e_reflow-&gt;height - (E_REFLOW_BORDER_WIDTH * 2);</div><div class='del'>-			</div><div class='del'>-			for ( i = 0; i &lt; e_reflow-&gt;column_count; i++) {</div><div class='del'>-				x_rect = running_width;</div><div class='del'>-				gnome_canvas_request_redraw(item-&gt;canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect);</div><div class='del'>-				running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if ( e_reflow-&gt;temp_column_width != -1 ) {</div><div class='del'>-			running_width = start_line * (e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-			column_width = e_reflow-&gt;temp_column_width;</div><div class='del'>-			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);</div><div class='del'>-			running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			y_rect = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			width_rect = E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-			height_rect = e_reflow-&gt;height - (E_REFLOW_BORDER_WIDTH * 2);</div><div class='del'>-			</div><div class='del'>-			for ( i = 0; i &lt; e_reflow-&gt;column_count; i++) {</div><div class='del'>-				x_rect = running_width;</div><div class='del'>-				gnome_canvas_request_redraw(item-&gt;canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect);</div><div class='del'>-				running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_reflow-&gt;previous_temp_column_width = e_reflow-&gt;temp_column_width;</div><div class='del'>-		e_reflow-&gt;need_column_resize = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_reflow_resize_children (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	EReflow *e_reflow;</div><div class='del'>-</div><div class='del'>-	e_reflow = E_REFLOW (item);</div><div class='del'>-	for ( list = e_reflow-&gt;items; list; list = list-&gt;next ) {</div><div class='del'>-		GnomeCanvasItem *child = GNOME_CANVAS_ITEM(list-&gt;data);</div><div class='del'>-		gnome_canvas_item_set(child,</div><div class='del'>-				      "width", (double) e_reflow-&gt;column_width,</div><div class='del'>-				      NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_reflow_point (GnomeCanvasItem *item,</div><div class='del'>-		double x, double y, int cx, int cy,</div><div class='del'>-		GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	double distance = 1;</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;point)</div><div class='del'>-		distance = GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;point (item, x, y, cx, cy, actual_item);</div><div class='del'>-	if (*actual_item)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0;</div><div class='del'>-#if 0</div><div class='del'>-	if (y &gt;= E_REFLOW_BORDER_WIDTH &amp;&amp; y &lt;= e_reflow-&gt;height - E_REFLOW_BORDER_WIDTH) {</div><div class='del'>-	        float n_x;</div><div class='del'>-		n_x = x;</div><div class='del'>-		n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;</div><div class='del'>-		n_x = fmod(n_x, (e_reflow-&gt;column_width + E_REFLOW_FULL_GUTTER));</div><div class='del'>-		if (n_x &lt; E_REFLOW_FULL_GUTTER) {</div><div class='del'>-			*actual_item = item;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return distance;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_reflow( EReflow *e_reflow )</div><div class='del'>-{</div><div class='del'>-	gdouble running_height;</div><div class='del'>-	GList *list;</div><div class='del'>-	double item_height;</div><div class='del'>-</div><div class='del'>-	if (e_reflow-&gt;columns) {</div><div class='del'>-		g_list_free (e_reflow-&gt;columns);</div><div class='del'>-		e_reflow-&gt;columns = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_reflow-&gt;column_count = 0;</div><div class='del'>-</div><div class='del'>-	if (e_reflow-&gt;items == NULL) {</div><div class='del'>-		e_reflow-&gt;columns = NULL;</div><div class='del'>-		e_reflow-&gt;column_count = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = e_reflow-&gt;items;</div><div class='del'>-	</div><div class='del'>-	gtk_object_get (GTK_OBJECT(list-&gt;data),</div><div class='del'>-			"height", &amp;item_height,</div><div class='del'>-			NULL);</div><div class='del'>-	running_height = E_REFLOW_BORDER_WIDTH + item_height + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-	e_reflow-&gt;columns = g_list_append (e_reflow-&gt;columns, list);</div><div class='del'>-	e_reflow-&gt;column_count = 1;</div><div class='del'>-</div><div class='del'>-	list = g_list_next(list);</div><div class='del'>-</div><div class='del'>-	for ( ; list; list = g_list_next(list)) {</div><div class='del'>-		gtk_object_get (GTK_OBJECT(list-&gt;data),</div><div class='del'>-				"height", &amp;item_height,</div><div class='del'>-				NULL);</div><div class='del'>-		if (running_height + item_height + E_REFLOW_BORDER_WIDTH &gt; e_reflow-&gt;height) {</div><div class='del'>-			running_height = E_REFLOW_BORDER_WIDTH + item_height + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			e_reflow-&gt;columns = g_list_append (e_reflow-&gt;columns, list);</div><div class='del'>-			e_reflow-&gt;column_count ++;</div><div class='del'>-		} else {</div><div class='del'>-			running_height += item_height + E_REFLOW_BORDER_WIDTH;</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_empty(EReflow *e_reflow)</div><div class='del'>-{</div><div class='del'>-	if (e_reflow-&gt;items == NULL) {</div><div class='del'>-		if (e_reflow-&gt;empty_text) {</div><div class='del'>-			if (e_reflow-&gt;empty_message) {</div><div class='del'>-				gnome_canvas_item_set(e_reflow-&gt;empty_text,</div><div class='del'>-						      "width", e_reflow-&gt;minimum_width,</div><div class='del'>-						      "text", e_reflow-&gt;empty_message,</div><div class='del'>-						      NULL);</div><div class='del'>-				e_canvas_item_move_absolute(e_reflow-&gt;empty_text,</div><div class='del'>-							    e_reflow-&gt;minimum_width / 2,</div><div class='del'>-							    0);</div><div class='del'>-			} else {</div><div class='del'>-				gtk_object_destroy(GTK_OBJECT(e_reflow-&gt;empty_text));</div><div class='del'>-				e_reflow-&gt;empty_text = NULL;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (e_reflow-&gt;empty_message)</div><div class='del'>-				e_reflow-&gt;empty_text = </div><div class='del'>-					gnome_canvas_item_new(GNOME_CANVAS_GROUP(e_reflow),</div><div class='del'>-							      e_text_get_type(),</div><div class='del'>-							      "anchor", GTK_ANCHOR_N,</div><div class='del'>-							      "width", e_reflow-&gt;minimum_width,</div><div class='del'>-							      "clip", TRUE,</div><div class='del'>-							      "use_ellipsis", TRUE,</div><div class='del'>-							      "font_gdk", GTK_WIDGET(GNOME_CANVAS_ITEM(e_reflow)-&gt;canvas)-&gt;style-&gt;font,</div><div class='del'>-							      "fill_color", "black",</div><div class='del'>-							      "justification", GTK_JUSTIFY_CENTER,</div><div class='del'>-							      "text", e_reflow-&gt;empty_message,</div><div class='del'>-							      NULL);</div><div class='del'>-			e_canvas_item_move_absolute(e_reflow-&gt;empty_text,</div><div class='del'>-						    e_reflow-&gt;minimum_width / 2,</div><div class='del'>-						    0);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (e_reflow-&gt;empty_text) {</div><div class='del'>-			gtk_object_destroy(GTK_OBJECT(e_reflow-&gt;empty_text));</div><div class='del'>-			e_reflow-&gt;empty_text = 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_reflow_reflow( GnomeCanvasItem *item, int flags )</div><div class='del'>-{</div><div class='del'>-	EReflow *e_reflow = E_REFLOW(item);</div><div class='del'>-	if ( GTK_OBJECT_FLAGS( e_reflow ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-</div><div class='del'>-		gdouble old_width;</div><div class='del'>-		gdouble running_width;</div><div class='del'>-</div><div class='del'>-		_reflow (e_reflow);</div><div class='del'>-		</div><div class='del'>-		old_width = e_reflow-&gt;width;</div><div class='del'>-		</div><div class='del'>-		running_width = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-</div><div class='del'>-		if (e_reflow-&gt;items == NULL) {</div><div class='del'>-		} else {</div><div class='del'>-			GList *list;</div><div class='del'>-			GList *next_column;</div><div class='del'>-			gdouble item_height;</div><div class='del'>-			gdouble running_height;</div><div class='del'>-</div><div class='del'>-			running_height = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			</div><div class='del'>-			list = e_reflow-&gt;items;</div><div class='del'>-			gtk_object_get (GTK_OBJECT(list-&gt;data),</div><div class='del'>-					"height", &amp;item_height,</div><div class='del'>-					NULL);</div><div class='del'>-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list-&gt;data),</div><div class='del'>-						    (double) running_width,</div><div class='del'>-						    (double) running_height);</div><div class='del'>-			running_height += item_height + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			next_column = g_list_next(e_reflow-&gt;columns);</div><div class='del'>-			list = g_list_next(list);</div><div class='del'>-			</div><div class='del'>-			for( ; list; list = g_list_next(list)) {</div><div class='del'>-				gtk_object_get (GTK_OBJECT(list-&gt;data),</div><div class='del'>-						"height", &amp;item_height,</div><div class='del'>-						NULL);</div><div class='del'>-</div><div class='del'>-				if (next_column &amp;&amp; (next_column-&gt;data == list)) {</div><div class='del'>-					next_column = g_list_next (next_column);</div><div class='del'>-					running_height = E_REFLOW_BORDER_WIDTH;</div><div class='del'>-					running_width += e_reflow-&gt;column_width + E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-				}</div><div class='del'>-				e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list-&gt;data),</div><div class='del'>-							    (double) running_width,</div><div class='del'>-							    (double) running_height);</div><div class='del'>-</div><div class='del'>-				running_height += item_height + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-			}</div><div class='del'>-				 </div><div class='del'>-		}</div><div class='del'>-		e_reflow-&gt;width = running_width + e_reflow-&gt;column_width + E_REFLOW_BORDER_WIDTH;</div><div class='del'>-		if ( e_reflow-&gt;width &lt; e_reflow-&gt;minimum_width )</div><div class='del'>-			e_reflow-&gt;width = e_reflow-&gt;minimum_width;</div><div class='del'>-		if (old_width != e_reflow-&gt;width)</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'>-void</div><div class='del'>-e_reflow_add_item(EReflow *e_reflow, GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	if (E_REFLOW_CLASS(GTK_OBJECT(e_reflow)-&gt;klass)-&gt;add_item)</div><div class='del'>-		(E_REFLOW_CLASS(GTK_OBJECT(e_reflow)-&gt;klass)-&gt;add_item) (e_reflow, item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_reflow_post_add_item(EReflow *e_reflow, GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	set_empty(e_reflow);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/minicard/e-reflow.h b/addressbook/gui/minicard/e-reflow.h<br/>deleted file mode 100644<br/>index eb66b094a5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/e-reflow.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/e-reflow.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-reflow.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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_REFLOW_H__</div><div class='del'>-#define __E_REFLOW_H__</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'>-/* EReflow - 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'>- * 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_REFLOW_TYPE			(e_reflow_get_type ())</div><div class='del'>-#define E_REFLOW(obj)			(GTK_CHECK_CAST ((obj), E_REFLOW_TYPE, EReflow))</div><div class='del'>-#define E_REFLOW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_REFLOW_TYPE, EReflowClass))</div><div class='del'>-#define E_IS_REFLOW(obj)		(GTK_CHECK_TYPE ((obj), E_REFLOW_TYPE))</div><div class='del'>-#define E_IS_REFLOW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_REFLOW_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EReflow       EReflow;</div><div class='del'>-typedef struct _EReflowClass  EReflowClass;</div><div class='del'>-</div><div class='del'>-struct _EReflow</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'>-	GList *items; /* Of type GnomeCanvasItem */</div><div class='del'>-	GList *columns; /* Of type GList of type GnomeCanvasItem (points into items) */</div><div class='del'>-	gint column_count; /* Number of columnns */</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem *empty_text;</div><div class='del'>-	gchar *empty_message;</div><div class='del'>-	</div><div class='del'>-	double minimum_width;</div><div class='del'>-	double width;</div><div class='del'>-	double height;</div><div class='del'>-       </div><div class='del'>-	double column_width;</div><div class='del'>-</div><div class='del'>-	int idle;</div><div class='del'>-</div><div class='del'>-	/* These are all for when the column is being dragged. */</div><div class='del'>-	gboolean column_drag;</div><div class='del'>-	gdouble start_x;</div><div class='del'>-	gint which_column_dragged;</div><div class='del'>-	double temp_column_width;</div><div class='del'>-	double previous_temp_column_width;</div><div class='del'>-</div><div class='del'>-	guint need_height_update : 1;</div><div class='del'>-	guint need_column_resize : 1;</div><div class='del'>-</div><div class='del'>-	guint default_cursor_shown : 1;</div><div class='del'>-	GdkCursor *arrow_cursor;</div><div class='del'>-	GdkCursor *default_cursor;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EReflowClass</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroupClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods. */</div><div class='del'>-	void (* add_item) (EReflow *reflow, GnomeCanvasItem *item);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * To be added to a reflow, an item must have the argument "width" as</div><div class='del'>- * a Read/Write argument and "height" as a Read Only argument.  It</div><div class='del'>- * should also do an ECanvas parent reflow request if its size</div><div class='del'>- * changes.</div><div class='del'>- */</div><div class='del'>-void       e_reflow_add_item(EReflow *e_reflow, GnomeCanvasItem *item);</div><div class='del'>-GtkType    e_reflow_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Internal usage only: */</div><div class='del'>-void e_reflow_post_add_item(EReflow *e_reflow, 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_REFLOW_H__ */</div><div class='head'>diff --git a/addressbook/gui/minicard/test-minicard-label.c b/addressbook/gui/minicard/test-minicard-label.c<br/>deleted file mode 100644<br/>index 57bc69222a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/test-minicard-label.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/test-minicard-label.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'>-/* test-minicard-label.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</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;gnome.h&gt;</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</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, Helix Code, 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/minicard/test-minicard-view.c b/addressbook/gui/minicard/test-minicard-view.c<br/>deleted file mode 100644<br/>index c03d11d07e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/test-minicard-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/test-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +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 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.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, Helix Code, 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/minicard/test-minicard.c b/addressbook/gui/minicard/test-minicard.c<br/>deleted file mode 100644<br/>index e16ca675b3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/test-minicard.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/test-minicard.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'>-/* test-minicard.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</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;gnome.h&gt;</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, Helix Code, 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/minicard/test-reflow.c b/addressbook/gui/minicard/test-reflow.c<br/>deleted file mode 100644<br/>index dacaeb055c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/minicard/test-reflow.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/minicard/test-reflow.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'>-/* test-reflow.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</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@helixcode.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;gnome.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include "e-reflow.h"</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, 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, Helix Code, 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 *scrollbar;</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);</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_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/Makefile.am b/addressbook/gui/widgets/Makefile.am<br/>deleted file mode 100644<br/>index 0eb7946ac5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-minicard\"			\</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'>-	$(BONOBO_GNOME_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-minicard.c				\</div><div class='del'>-	e-minicard.h				\</div><div class='del'>-	e-minicard-label.c			\</div><div class='del'>-	e-minicard-label.h			\</div><div class='del'>-	e-minicard-view.c			\</div><div class='del'>-	e-minicard-view.h			\</div><div class='del'>-	e-reflow-sorted.c			\</div><div class='del'>-	e-reflow-sorted.h			\</div><div class='del'>-	e-reflow.c				\</div><div class='del'>-	e-reflow.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =				\</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'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)				\</div><div class='del'>-	libeminicard.a					\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la		\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a</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'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)						\</div><div class='del'>-	libeminicard.a							\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)						\</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)/widgets/e-table/libetable.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)/widgets/e-text/libetext.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'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)						\</div><div class='del'>-	$(BONOBO_GNOME_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)/widgets/e-table/libetable.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)/widgets/e-text/libetext.a</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'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(GNOMEGNORBA_LIBS)						\</div><div class='del'>-	$(BONOBO_GNOME_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)/widgets/e-table/libetable.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)/widgets/e-text/libetext.a</div><div class='head'>diff --git a/addressbook/gui/widgets/alphabet.glade b/addressbook/gui/widgets/alphabet.glade<br/>deleted file mode 100644<br/>index bc6e5f3798..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/alphabet.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/alphabet.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,357 +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;alphabet&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;alphabet&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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;alphabet.glade.h&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;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;window2&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window2&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;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;scrolledwindow-top&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'>-</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;border_width&gt;4&lt;/border_width&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;vbox2&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;27&lt;/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;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button-1&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;123&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;button-a&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;a&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;button-b&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;b&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;button-c&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;c&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;button-d&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;d&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;button-e&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;e&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;button-f&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;f&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;button-g&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;g&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;button-h&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;h&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;button-i&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;i&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;button-j&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;j&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;button-k&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;k&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;button-l&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;l&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;button-m&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;m&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;button-n&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;n&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;button-o&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;o&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;button-p&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;p&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;button-q&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;q&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;button-r&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;r&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;button-s&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;s&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;button-t&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;t&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;button-u&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;u&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;button-v&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;v&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;button-w&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;w&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;button-x&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;x&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;button-y&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;y&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;button-z&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;z&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'>-    &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/widgets/alphabet.glade.h b/addressbook/gui/widgets/alphabet.glade.h<br/>deleted file mode 100644<br/>index 2448eeb4fc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/alphabet.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/alphabet.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("window2");</div><div class='del'>-gchar *s = N_("123");</div><div class='del'>-gchar *s = N_("a");</div><div class='del'>-gchar *s = N_("b");</div><div class='del'>-gchar *s = N_("c");</div><div class='del'>-gchar *s = N_("d");</div><div class='del'>-gchar *s = N_("e");</div><div class='del'>-gchar *s = N_("f");</div><div class='del'>-gchar *s = N_("g");</div><div class='del'>-gchar *s = N_("h");</div><div class='del'>-gchar *s = N_("i");</div><div class='del'>-gchar *s = N_("j");</div><div class='del'>-gchar *s = N_("k");</div><div class='del'>-gchar *s = N_("l");</div><div class='del'>-gchar *s = N_("m");</div><div class='del'>-gchar *s = N_("n");</div><div class='del'>-gchar *s = N_("o");</div><div class='del'>-gchar *s = N_("p");</div><div class='del'>-gchar *s = N_("q");</div><div class='del'>-gchar *s = N_("r");</div><div class='del'>-gchar *s = N_("s");</div><div class='del'>-gchar *s = N_("t");</div><div class='del'>-gchar *s = N_("u");</div><div class='del'>-gchar *s = N_("v");</div><div class='del'>-gchar *s = N_("w");</div><div class='del'>-gchar *s = N_("x");</div><div class='del'>-gchar *s = N_("y");</div><div class='del'>-gchar *s = N_("z");</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 f5d2fca7cb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-model.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-addressbook-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,376 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Helix Code, 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'>-</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'>-/*</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'>-};</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'>-	int i;</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'>-	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)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book));</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'>-	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'>-addressbook_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'>-addressbook_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);</div><div class='del'>-	return addressbook-&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'>-addressbook_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);</div><div class='del'>-	const char *value;</div><div class='del'>-	if ( col &gt;= E_CARD_SIMPLE_FIELD_LAST - 1|| row &gt;= addressbook-&gt;data_count )</div><div class='del'>-		return NULL;</div><div class='del'>-	value = e_card_simple_get_const(addressbook-&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'>-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);</div><div class='del'>-	ECard *card;</div><div class='del'>-	if ( col &gt;= E_CARD_SIMPLE_FIELD_LAST - 1|| row &gt;= addressbook-&gt;data_count )</div><div class='del'>-		return;</div><div class='del'>-	e_card_simple_set(addressbook-&gt;data[row],</div><div class='del'>-			  col + 1,</div><div class='del'>-			  val);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(addressbook-&gt;data[row]),</div><div class='del'>-		       "card", &amp;card,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_book_commit_card(addressbook-&gt;book, card, NULL, 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'>-addressbook_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'>-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 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'>-	model-&gt;data = g_realloc(model-&gt;data, (model-&gt;data_count + g_list_length((GList *)cards)) * sizeof(ECard *));</div><div class='del'>-	for ( ; cards; cards = cards-&gt;next) {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(cards-&gt;data));</div><div class='del'>-		model-&gt;data[model-&gt;data_count++] = e_card_simple_new (E_CARD(cards-&gt;data));</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'>-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'>-	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'>-			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'>-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_simple_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_simple_new(E_CARD(cards-&gt;data));</div><div class='del'>-				gtk_object_ref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-				e_table_model_row_changed(E_TABLE_MODEL(model), 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'>-e_addressbook_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 = 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'>-	</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;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'>-}</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 \"full_name\" \"\")");</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;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</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'>-	int i;</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)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book_view));</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'>-</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'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	e_table_model_changed(E_TABLE_MODEL(model));</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'>-		e_book_get_book_view(model-&gt;book, model-&gt;query, book_view_loaded, model);</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; 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'>-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'>-			gtk_object_unref(GTK_OBJECT(model-&gt;book));</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'>-			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'>-		}</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'>-	}</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'>-	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'>-ETableModel *</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 E_TABLE_MODEL(et);</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 bff9a21d00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-model.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-addressbook-model.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'>-#ifndef _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-#define _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include "e-table-model.h"</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_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'>-/* 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 {</div><div class='del'>-	ETableModel 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'>-	ECardSimple **data;</div><div class='del'>-	int data_count;</div><div class='del'>-</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id;</div><div class='del'>-} EAddressbookModel;</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'>-} EAddressbookModelClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_addressbook_model_get_type (void);</div><div class='del'>-ETableModel *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'>-</div><div class='del'>-#endif /* _E_ADDRESSBOOK_MODEL_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 e765a89f21..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-label.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-minicard-label.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,446 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include "e-text.h"</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas-utils.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'>-};</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'>- </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);</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'>-	}</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'>-	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'>-	static GdkFont *font = NULL;</div><div class='del'>-</div><div class='del'>-	if (font == NULL) {</div><div class='del'>-		font = gdk_font_load("lucidasans-10");</div><div class='del'>-	}</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'>-				 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", TRUE,</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_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 08eb51ee53..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-label.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-minicard-label.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;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'>-/* 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'>-	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.c b/addressbook/gui/widgets/e-minicard-view.c<br/>deleted file mode 100644<br/>index 28f8243dff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,426 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-#include "e-minicard.h"</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-static void e_minicard_view_init		(EMinicardView		 *reflow);</div><div class='del'>-static void e_minicard_view_class_init	(EMinicardViewClass	 *klass);</div><div class='del'>-static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_destroy (GtkObject *object);</div><div class='del'>-static gboolean e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event);</div><div class='del'>-static void canvas_destroy (GtkObject *object, EMinicardView *view);</div><div class='del'>-static void disconnect_signals (EMinicardView *view);</div><div class='del'>-</div><div class='del'>-static EReflowSortedClass *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'>-};</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'>-    {</div><div class='del'>-      static const GtkTypeInfo reflow_info =</div><div class='del'>-      {</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 (e_reflow_sorted_get_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'>-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'>-	</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 (e_reflow_sorted_get_type ());</div><div class='del'>-	</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'>-	</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'>-	/* 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;book = NULL;</div><div class='del'>-	view-&gt;query = g_strdup("(contains \"full_name\" \"\")");</div><div class='del'>-	view-&gt;book_view = NULL;</div><div class='del'>-	view-&gt;get_view_idle = 0;</div><div class='del'>-	view-&gt;create_card_id = 0;</div><div class='del'>-	view-&gt;remove_card_id = 0;</div><div class='del'>-	view-&gt;modify_card_id = 0;</div><div class='del'>-	view-&gt;canvas_destroy_id = 0;</div><div class='del'>-	</div><div class='del'>-	gtk_object_set(GTK_OBJECT(view),</div><div class='del'>-		       "empty_message", _("\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'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	E_REFLOW_SORTED(view)-&gt;compare_func = (GCompareFunc) e_minicard_compare;</div><div class='del'>-	E_REFLOW_SORTED(view)-&gt;string_func  = (EReflowStringFunc) e_minicard_get_card_id;</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, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	for (; cards; cards = g_list_next(cards)) {</div><div class='del'>-		GnomeCanvasItem *item = gnome_canvas_item_new(GNOME_CANVAS_GROUP(view),</div><div class='del'>-							      e_minicard_get_type(),</div><div class='del'>-							      "card", cards-&gt;data,</div><div class='del'>-							      NULL);</div><div class='del'>-		e_reflow_add_item(E_REFLOW(view), item);</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, const GList *cards, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	for (; cards; cards = g_list_next(cards)) {</div><div class='del'>-		ECard *card = cards-&gt;data;</div><div class='del'>-		gchar *id = e_card_get_id(card);</div><div class='del'>-		GnomeCanvasItem *item = e_reflow_sorted_get_item(E_REFLOW_SORTED(view), id);</div><div class='del'>-		if (item &amp;&amp; !GTK_OBJECT_DESTROYED(item)) {</div><div class='del'>-			gnome_canvas_item_set(item,</div><div class='del'>-					      "card", card,</div><div class='del'>-					      NULL);</div><div class='del'>-			e_reflow_sorted_reorder_item(E_REFLOW_SORTED(view), 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'>-remove_card(EBookView *book_view, const char *id, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	e_reflow_sorted_remove_item(E_REFLOW_SORTED(view), id);</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'>-	EMinicardView *view = closure;</div><div class='del'>-	disconnect_signals(view);</div><div class='del'>-	if (view-&gt;book_view)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book_view));</div><div class='del'>-</div><div class='del'>-	if (!view-&gt;canvas_destroy_id)</div><div class='del'>-		view-&gt;canvas_destroy_id = </div><div class='del'>-			gtk_signal_connect(GTK_OBJECT(GNOME_CANVAS_ITEM(view)-&gt;canvas),</div><div class='del'>-					   "destroy", GTK_SIGNAL_FUNC(canvas_destroy),</div><div class='del'>-					   view);</div><div class='del'>-</div><div class='del'>-	view-&gt;book_view = book_view;</div><div class='del'>-	if (view-&gt;book_view)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(view-&gt;book_view));</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	view-&gt;create_card_id = gtk_signal_connect(GTK_OBJECT(view-&gt;book_view),</div><div class='del'>-						  "card_added",</div><div class='del'>-						  GTK_SIGNAL_FUNC(create_card),</div><div class='del'>-						  view);</div><div class='del'>-	view-&gt;remove_card_id = gtk_signal_connect(GTK_OBJECT(view-&gt;book_view),</div><div class='del'>-						  "card_removed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(remove_card),</div><div class='del'>-						  view);</div><div class='del'>-	view-&gt;modify_card_id = gtk_signal_connect(GTK_OBJECT(view-&gt;book_view),</div><div class='del'>-						  "card_changed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(modify_card),</div><div class='del'>-						  view);</div><div class='del'>-</div><div class='del'>-	g_list_foreach(E_REFLOW(view)-&gt;items, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_foreach(E_REFLOW(view)-&gt;items, (GFunc) gtk_object_destroy, NULL);</div><div class='del'>-	g_list_free(E_REFLOW(view)-&gt;items);</div><div class='del'>-	E_REFLOW(view)-&gt;items = NULL;</div><div class='del'>-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_view(EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;book &amp;&amp; view-&gt;query)</div><div class='del'>-		e_book_get_book_view(view-&gt;book, view-&gt;query, book_view_loaded, view);</div><div class='del'>-</div><div class='del'>-	view-&gt;get_view_idle = 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_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_BOOK:</div><div class='del'>-		if (view-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-		view-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-		if (view-&gt;book) {</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-			if (view-&gt;get_view_idle == 0)</div><div class='del'>-				view-&gt;get_view_idle = g_idle_add((GSourceFunc)get_view, view);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		g_free(view-&gt;query);</div><div class='del'>-		view-&gt;query = g_strdup(GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (view-&gt;get_view_idle == 0)</div><div class='del'>-			view-&gt;get_view_idle = g_idle_add((GSourceFunc)get_view, 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 *e_minicard_view;</div><div class='del'>-</div><div class='del'>-	e_minicard_view = E_MINICARD_VIEW (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_minicard_view-&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_minicard_view-&gt;query);</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;get_view_idle)</div><div class='del'>-		g_source_remove(view-&gt;get_view_idle);</div><div class='del'>-	if (view-&gt;canvas_destroy_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (GNOME_CANVAS_ITEM(view)-&gt;canvas),</div><div class='del'>-				      view-&gt;canvas_destroy_id);</div><div class='del'>-	disconnect_signals(view);</div><div class='del'>-	g_free(view-&gt;query);</div><div class='del'>-	if (view-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-	if (view-&gt;book_view)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book_view));</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'>-card_added_cb (EBook* book, EBookStatus status, const char *id,</div><div class='del'>-	    gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the add_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_add_card (book, card, card_added_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the commit_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_commit_card (book, card, card_changed_cb, NULL);</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 (EContactEditor *ce, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</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'>-			ECard *card;</div><div class='del'>-			EContactEditor *ce;</div><div class='del'>-			EBook *book;</div><div class='del'>-</div><div class='del'>-			card = e_card_new("");</div><div class='del'>-</div><div class='del'>-			gtk_object_get(GTK_OBJECT(view), "book", &amp;book, NULL);</div><div class='del'>-			g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-			ce = e_contact_editor_new (card, TRUE);</div><div class='del'>-</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (add_card_cb), book);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (commit_card_cb), book);</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_object_sink(GTK_OBJECT(card));</div><div class='del'>-		}</div><div class='del'>-		return TRUE;</div><div class='del'>-	default:</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'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disconnect_signals(EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;book_view &amp;&amp; view-&gt;create_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (view-&gt;book_view),</div><div class='del'>-				      view-&gt;create_card_id);</div><div class='del'>-	if (view-&gt;book_view &amp;&amp; view-&gt;remove_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (view-&gt;book_view),</div><div class='del'>-				      view-&gt;remove_card_id);</div><div class='del'>-	if (view-&gt;book_view &amp;&amp; view-&gt;modify_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (view-&gt;book_view),</div><div class='del'>-				      view-&gt;modify_card_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-canvas_destroy(GtkObject *object, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	disconnect_signals(view);</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'>-	if (view-&gt;book) {</div><div class='del'>-		EReflow *reflow = E_REFLOW(view);</div><div class='del'>-		GList *list;</div><div class='del'>-		for (list = reflow-&gt;items; list; list = g_list_next(list)) {</div><div class='del'>-			GnomeCanvasItem *item = list-&gt;data;</div><div class='del'>-			gboolean 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) {</div><div class='del'>-				ECard *card;</div><div class='del'>-				gtk_object_get(GTK_OBJECT(item),</div><div class='del'>-					       "card", &amp;card,</div><div class='del'>-					       NULL);</div><div class='del'>-				e_book_remove_card(view-&gt;book, card, cb, closure);</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 int</div><div class='del'>-compare_to_letter(EMinicard *card, char *letter)</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 (*letter == '1')</div><div class='del'>-		return 1;</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 strncasecmp(file_as, letter, 1);</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'>-</div><div class='del'>-void       e_minicard_view_jump_to_letter   (EMinicardView *view,</div><div class='del'>-					     char           letter)</div><div class='del'>-{</div><div class='del'>-	e_reflow_sorted_jump(E_REFLOW_SORTED(view),</div><div class='del'>-			     (GCompareFunc) compare_to_letter,</div><div class='del'>-			     &amp;letter);</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 a166a6ade1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-minicard-view.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'>-/* e-minicard-view.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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 &lt;gnome.h&gt;</div><div class='del'>-#include "e-reflow-sorted.h"</div><div class='del'>-#include &lt;ebook/e-book.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'>-/* 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'>-	EReflowSorted 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'>-	int canvas_destroy_id;</div><div class='del'>-</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewClass</div><div class='del'>-{</div><div class='del'>-	EReflowSortedClass parent_class;</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'>-					     char           letter);</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.c b/addressbook/gui/widgets/e-minicard.c<br/>deleted file mode 100644<br/>index 4a73fc8eb4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,728 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include "e-text.h"</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include &lt;e-util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;e-util/e-popup-menu.h&gt;</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-minicard-view.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 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 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 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_CARD</div><div class='del'>-};</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::card", GTK_TYPE_OBJECT, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_CARD);</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'>-  </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'>-</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'>-  </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'>-  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'>-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'>-</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'>-			e_canvas_item_grab_focus(item);</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'>-		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_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'>-	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;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_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'>-</div><div class='del'>-	e_minicard = E_MINICARD (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( 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_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", "grey70",</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'>-				 "font", "lucidasans-bold-10",</div><div class='del'>-				 "fill_color", "black",</div><div class='del'>-				 "text", "",</div><div class='del'>-				 NULL );</div><div class='del'>-	e_canvas_item_move_absolute(e_minicard-&gt;header_text, 6, 6);</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_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as (GtkWidget *widget, EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	e_card_simple_sync_card(minicard-&gt;simple);</div><div class='del'>-	e_contact_save_as(_("Save as VCard"), minicard-&gt;card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the add_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_add_card (book, card, card_added_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the commit_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = E_BOOK (data);</div><div class='del'>-	e_book_commit_card (book, card, card_changed_cb, NULL);</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 (EContactEditor *ce, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</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'>-	</div><div class='del'>-	e_minicard = E_MINICARD (item);</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'>-			if ( focus_event-&gt;in ) {</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;rect, </div><div class='del'>-						       "outline_color", "grey50", </div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_rect, </div><div class='del'>-						       "fill_color", "darkblue",</div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_text, </div><div class='del'>-						       "fill_color", "white",</div><div class='del'>-						       NULL );</div><div class='del'>-				e_minicard-&gt;has_focus = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				EBook *book;</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'>-				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'>-				/* Add the card in the contact editor to our ebook */</div><div class='del'>-				e_book_commit_card (book,</div><div class='del'>-						    e_minicard-&gt;card,</div><div class='del'>-						    card_changed_cb,</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'>-						       "outline_color", NULL, </div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_rect, </div><div class='del'>-						       "fill_color", "grey70",</div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_text, </div><div class='del'>-						       "fill_color", "black",</div><div class='del'>-						       NULL );</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 (event-&gt;button.button == 1) {</div><div class='del'>-			e_canvas_item_grab_focus(item);</div><div class='del'>-		} else if (event-&gt;button.button == 3) {</div><div class='del'>-			EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, {NULL, NULL, NULL, 0} };</div><div class='del'>-			e_popup_menu_run (menu, (GdkEventButton *)event, 0, e_minicard);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</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'>-			EContactEditor *ce;</div><div class='del'>-			EBook *book;</div><div class='del'>-</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'>-			g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-			ce = e_contact_editor_new (e_minicard-&gt;card, FALSE);</div><div class='del'>-</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (add_card_cb), book);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",</div><div class='del'>-					    GTK_SIGNAL_FUNC (commit_card_cb), book);</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 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'>-	if ( GTK_OBJECT_FLAGS( e_minicard ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-		GList *list;</div><div class='del'>-		</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'>-				       NULL );</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'>-</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'>-}</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'>-	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'>-			       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_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'>-	static GdkFont *font = NULL;</div><div class='del'>-</div><div class='del'>-	if (font == NULL) {</div><div class='del'>-		font = gdk_font_load("lucidasans-10");</div><div class='del'>-	}</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 (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'>-		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 &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'>-					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'>-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 strcasecmp(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='head'>diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h<br/>deleted file mode 100644<br/>index 47da8110c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/e-minicard.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'>-/* e-minicard.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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'>-</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'>-</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'>-	gboolean has_focus;</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'>-	void (* resize) (EMinicard *minicard);</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'>-char      *e_minicard_get_card_id (EMinicard *minicard);</div><div class='del'>-int        e_minicard_compare     (EMinicard *minicard1, EMinicard *minicard2);</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/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c<br/>deleted file mode 100644<br/>index 57bc69222a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard-label.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/test-minicard-label.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'>-/* test-minicard-label.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</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;gnome.h&gt;</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</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, Helix Code, 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 c03d11d07e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/test-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +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 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.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, Helix Code, 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 e16ca675b3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/test-minicard.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'>-/* test-minicard.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</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;gnome.h&gt;</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, Helix Code, 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 dacaeb055c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-reflow.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/gui/widgets/test-reflow.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'>-/* test-reflow.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.com&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, or (at your option)</div><div class='del'>- * 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'>-</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@helixcode.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;gnome.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include "e-reflow.h"</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, 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, Helix Code, 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 *scrollbar;</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);</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_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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 2e8e41c41f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +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'>-	e-contact-print.glade.h</div><div class='del'>-</div><div class='del'>-CPPFLAGS = \</div><div class='del'>-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	$(GNOME_PRINT_CFLAGS)			\</div><div class='del'>-        $(BONOBO_GNOME_CFLAGS)</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'>-</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.c			\</div><div class='del'>-	e-contact-print.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'>-</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'>-	$(EXTRA_GNOME_LIBS)	\</div><div class='del'>-	-lbonobo							\</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'>-	libecontactprint.a	\</div><div class='del'>-	$(GNOME_PRINT_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'>-	$(EXTRA_GNOME_LIBS)	\</div><div class='del'>-	-lbonobo							\</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'>-	libecontactprint.a	\</div><div class='del'>-	$(GNOME_PRINT_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(glade_DATA) $(ecps_DATA)</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 5eb5cadacf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-style-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print-style-editor.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'>- * e-contact-print-style-editor.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include "e-contact-print-style-editor.h"</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 cf0f17f889..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-style-editor.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print-style-editor.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'>-/* e-contact-print-style-editor.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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 e99cfe6d39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-types.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print-types.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'>- * e-contact-print-types.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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 aeb9cfee58..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1067 +0,0 @@</div><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  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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'>-</div><div class='del'>-#include "e-contact-print.h"</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;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;ctype.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'>-</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'>-	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_string(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_string_n(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_string(font, "    ");</div><div class='del'>-					linestart = lastend + 1;</div><div class='del'>-					x += gnome_font_get_width_string_n(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_string_n(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_string_n(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_string(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_string_n(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_string(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 * font-&gt;size;</div><div class='del'>-		if ( first_line ) {</div><div class='del'>-			x += gnome_font_get_width_string(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 * .2 * font-&gt;size;</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 * font-&gt;size;</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 * font-&gt;size;</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_string(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'>-	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_string(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_string(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_string(ctxt-&gt;style-&gt;body_font, "123") + ctxt-&gt;style-&gt;body_font-&gt;size / 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_string(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_string(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 += ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</div><div class='del'>-</div><div class='del'>-	height += ctxt-&gt;style-&gt;headings_font-&gt;size * .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 += ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</div><div class='del'>-</div><div class='del'>-	height += ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</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'>-		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_string(ctxt-&gt;style-&gt;body_font, e_card_simple_get_name(simple, field));</div><div class='del'>-			xoff += gnome_font_get_width_string(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 * ctxt-&gt;style-&gt;body_font-&gt;size;</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	height += ctxt-&gt;style-&gt;headings_font-&gt;size * .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_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 -= ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= ctxt-&gt;style-&gt;headings_font-&gt;size * .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 + ctxt-&gt;style-&gt;headings_font-&gt;size * .2, 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) - ctxt-&gt;style-&gt;headings_font-&gt;size * .2, .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 -= ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</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'>-		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'>-			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_string(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_string(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 * ctxt-&gt;style-&gt;body_font-&gt;size;</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 -= ctxt-&gt;style-&gt;headings_font-&gt;size * .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'>-	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'>-		gchar *file_as;</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 &amp;&amp; (!ctxt-&gt;character || *ctxt-&gt;character != tolower(*file_as)) ) {</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;character)</div><div class='del'>-				ctxt-&gt;character = g_strdup(" ");</div><div class='del'>-			*ctxt-&gt;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, 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'>-		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'>-	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'>-	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 strcasecmp(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'>-	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'>-	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'>-	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 += ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</div><div class='del'>-</div><div class='del'>-	height += ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</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'>-		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 * ctxt-&gt;style-&gt;body_font-&gt;size;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	height += ctxt-&gt;style-&gt;headings_font-&gt;size * .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 -= ctxt-&gt;style-&gt;headings_font-&gt;size * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= ctxt-&gt;style-&gt;headings_font-&gt;size * .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 * ctxt-&gt;style-&gt;body_font-&gt;size;</div><div class='del'>-	dotwidth = xoff - </div><div class='del'>-		gnome_font_get_width_string(ctxt-&gt;style-&gt;body_font, e_card_get_string_fileas(card)) - </div><div class='del'>-		gnome_font_get_width_string(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_string(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 * ctxt-&gt;style-&gt;body_font-&gt;size;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;y -= ctxt-&gt;style-&gt;headings_font-&gt;size * .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'>-		gchar *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(*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'>-	style-&gt;headings_font = gnome_font_new("Helvetica-Bold", 8);</div><div class='del'>-	style-&gt;body_font = gnome_font_new("Helvetica", 6);</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'>-	style-&gt;header_font = gnome_font_new("Helvetica", 6);</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'>-	style-&gt;footer_font = gnome_font_new("Helvetica", 6);</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'>-	EBook *book = gtk_object_get_data(GTK_OBJECT(dialog), "book");</div><div class='del'>-	char *query = gtk_object_get_data(GTK_OBJECT(dialog), "query");</div><div class='del'>-	gdouble font_size;</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), ctxt-&gt;style-&gt;headings_font-&gt;size * 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'>-		ctxt-&gt;cards = NULL;</div><div class='del'>-		e_contact_do_print(book, ctxt-&gt;query, ctxt);</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), ctxt-&gt;style-&gt;headings_font-&gt;size * 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'>-		gtk_object_ref(GTK_OBJECT(book));</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'>-		e_contact_do_print(book, ctxt-&gt;query, ctxt);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(book));</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), "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='head'>diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade<br/>deleted file mode 100644<br/>index be24c9fc60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2009 +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;use_widget_names&gt;False&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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-contact-print.glade.h&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;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;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;Font...&lt;/label&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;/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;Font...&lt;/label&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;/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'>-</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'>-  &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.glade.h b/addressbook/printing/e-contact-print.glade.h<br/>deleted file mode 100644<br/>index b3b03d6d68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Page Setup:");</div><div class='del'>-gchar *s = N_("Style name:");</div><div class='del'>-gchar *s = N_("Preview:");</div><div class='del'>-gchar *s = N_("Options");</div><div class='del'>-gchar *s = N_("Include:");</div><div class='del'>-gchar *s = N_("Sections:");</div><div class='del'>-gchar *s = N_("Immediately follow each other");</div><div class='del'>-gchar *s = N_("Letter tabs on side");</div><div class='del'>-gchar *s = N_("Headings for each letter");</div><div class='del'>-gchar *s = N_("Start on a new page");</div><div class='del'>-gchar *s = N_("Number of columns:");</div><div class='del'>-gchar *s = N_("Blank forms at end:");</div><div class='del'>-gchar *s = N_("Fonts");</div><div class='del'>-gchar *s = N_("Font...");</div><div class='del'>-gchar *s = N_("Font...");</div><div class='del'>-gchar *s = N_("Headings");</div><div class='del'>-gchar *s = N_("10 pt. Tahoma");</div><div class='del'>-gchar *s = N_("Body");</div><div class='del'>-gchar *s = N_("8 pt. Tahoma");</div><div class='del'>-gchar *s = N_("Shading");</div><div class='del'>-gchar *s = N_("Print using gray shading");</div><div class='del'>-gchar *s = N_("Format");</div><div class='del'>-gchar *s = N_("Paper");</div><div class='del'>-gchar *s = N_("Type:");</div><div class='del'>-gchar *s = N_("label26");</div><div class='del'>-gchar *s = N_("Dimensions:");</div><div class='del'>-gchar *s = N_("Width:");</div><div class='del'>-gchar *s = N_("Height:");</div><div class='del'>-gchar *s = N_("Paper source:");</div><div class='del'>-gchar *s = N_("Margins");</div><div class='del'>-gchar *s = N_("Top:");</div><div class='del'>-gchar *s = N_("Bottom:");</div><div class='del'>-gchar *s = N_("Left:");</div><div class='del'>-gchar *s = N_("Right:");</div><div class='del'>-gchar *s = N_("Page");</div><div class='del'>-gchar *s = N_("Size:");</div><div class='del'>-gchar *s = N_("label26");</div><div class='del'>-gchar *s = N_("Dimensions:");</div><div class='del'>-gchar *s = N_("Width:");</div><div class='del'>-gchar *s = N_("Height:");</div><div class='del'>-gchar *s = N_("Orientation");</div><div class='del'>-gchar *s = N_("Portrait");</div><div class='del'>-gchar *s = N_("Landscape");</div><div class='del'>-gchar *s = N_("Paper");</div><div class='del'>-gchar *s = N_("Font...");</div><div class='del'>-gchar *s = N_("Header");</div><div class='del'>-gchar *s = N_("Footer:");</div><div class='del'>-gchar *s = N_("Font...");</div><div class='del'>-gchar *s = N_("Reverse on even pages");</div><div class='del'>-gchar *s = N_("Header/Footer");</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 8649a2ff6a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/e-contact-print.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.h</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.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'>-</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 72cca146dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/medbook.ecps?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 53ca294d36..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/phonelist.ecps?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 5844851bfb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/smallbook.ecps?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 d4dccc0b87..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/test-contact-print-style-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/test-contact-print-style-editor.c</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'>-/* </div><div class='del'>- * test-contact-print-style-editor.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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, Helix Code, 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 1b73fda3da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/test-print.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>addressbook/printing/test-print.c</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'>- * test-print.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@helixcode.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 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 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;gnome.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, Helix Code, 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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/Makefile.am b/art/Makefile.am<br/>deleted file mode 100644<br/>index a7de1604af..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-imagesdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-images_DATA = \</div><div class='del'>-	evolution-calendar.png 		\</div><div class='del'>-	evolution-contacts.png 		\</div><div class='del'>-	evolution-inbox.png 		\</div><div class='del'>-	evolution-notes.png 		\</div><div class='del'>-	evolution-tasks.png 		\</div><div class='del'>-	evolution-calendar-mini.png 	\</div><div class='del'>-	evolution-contacts-mini.png 	\</div><div class='del'>-	evolution-inbox-mini.png 	\</div><div class='del'>-	evolution-notes-mini.png 	\</div><div class='del'>-	evolution-tasks-mini.png 	\</div><div class='del'>-	evolution-today.png 		\</div><div class='del'>-	briefcase.png       		\</div><div class='del'>-	cellphone.png       		\</div><div class='del'>-	globe.png           		\</div><div class='del'>-	house.png           		\</div><div class='del'>-	envelope.png        		\</div><div class='del'>-	malehead.png</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	attachment.xpm \</div><div class='del'>-	empty.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'>-	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'>-	$(images_DATA)</div><div class='head'>diff --git a/art/attachment.xpm b/art/attachment.xpm<br/>deleted file mode 100644<br/>index 1bcc0386d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/attachment.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/attachment.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * attachment_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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/briefcase.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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/cellphone.png</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 93b02c0164..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/empty.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/envelope.png b/art/envelope.png<br/>deleted file mode 100644<br/>index 77acd63100..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/envelope.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/envelope.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 5386190d96..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-calendar-mini.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 04ae1a1ad8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts-mini.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/evolution-contacts-mini.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 320ace418f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 3b0f90b292..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-inbox.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 0878645f9f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-tasks.png?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/evolution-tasks.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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/evolution-today.png</a><br/>+++ /dev/null</div>Binary files differ<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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/globe.png</a><br/>+++ /dev/null</div>Binary files differ<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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/house.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-new.xpm b/art/mail-new.xpm<br/>deleted file mode 100644<br/>index dee13fb6b3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-new.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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'>-" .@#########$.  ",</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='head'>diff --git a/art/mail-read.xpm b/art/mail-read.xpm<br/>deleted file mode 100644<br/>index 81bcdf8fd3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-read.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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'>-"   .++++++@.    ",</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='head'>diff --git a/art/mail-replied.xpm b/art/mail-replied.xpm<br/>deleted file mode 100644<br/>index 9b398da7e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-replied.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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'>-" .@#########$.  ",</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='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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/malehead.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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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.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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/priority-high.xpm b/art/priority-high.xpm<br/>deleted file mode 100644<br/>index 8858f5bf94..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/priority-high.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>art/priority-high.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_high_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #A7453E",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"        .       ",</div><div class='del'>-"       ...      ",</div><div class='del'>-"       ...      ",</div><div class='del'>-"       ...      ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       .        ",</div><div class='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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 2497bd97d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +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='del'>-GnomeCal-stubs.c</div><div class='del'>-GnomeCal-skels.c</div><div class='del'>-GnomeCal-common.c</div><div class='del'>-GnomeCal.h</div><div class='head'>diff --git a/calendar/AUTHORS b/calendar/AUTHORS<br/>deleted file mode 100644<br/>index 7e482aef97..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/AUTHORS?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/AUTHORS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +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='head'>diff --git a/calendar/ChangeLog b/calendar/ChangeLog<br/>deleted file mode 100644<br/>index bd4d231fde..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/ChangeLog?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4571 +0,0 @@</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 e173063a48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = doc idl cal-util pcs cal-client gui</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 bd3fc7c91c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +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'>-cal-client.lo</div><div class='del'>-cal-listener.lo</div><div class='del'>-libcal-client.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 9aef9d2fee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +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.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 = `$(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=\""$(datadir)/locale"\"        \</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'>-	$(BONOBO_GNOME_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.c		\</div><div class='del'>-	cal-listener.c		\</div><div class='del'>-	cal-listener.h</div><div class='del'>-</div><div class='del'>-libcal_clientinclude_HEADERS =	\</div><div class='del'>-	cal-client.h</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'>-	$(BONOBO_VFS_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la			\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical.a		\</div><div class='del'>-	libcal-client.la</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 f1e60be3f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/cal-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1064 +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 client</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "cal-client.h"</div><div class='del'>-#include "cal-listener.h"</div><div class='del'>-</div><div class='del'>-#include "cal-util/icalendar-save.h"</div><div class='del'>-#include "cal-util/icalendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Loading state for the calendar client */</div><div class='del'>-typedef enum {</div><div class='del'>-	LOAD_STATE_NOT_LOADED,</div><div class='del'>-	LOAD_STATE_LOADING,</div><div class='del'>-	LOAD_STATE_LOADED</div><div class='del'>-} LoadState;</div><div class='del'>-</div><div class='del'>-/* Private part of the CalClient structure */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Load state to avoid multiple loads */</div><div class='del'>-	LoadState load_state;</div><div class='del'>-</div><div class='del'>-	/* The calendar factory we are contacting */</div><div class='del'>-	Evolution_Calendar_CalFactory factory;</div><div class='del'>-</div><div class='del'>-	/* Our calendar listener */</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'>-	Evolution_Calendar_Cal cal;</div><div class='del'>-} CalClientPrivate;</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_LOADED,</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_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 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'>- * @void:</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'>-/* 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_LOADED] =</div><div class='del'>-		gtk_signal_new ("cal_loaded",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientClass, cal_loaded),</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[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'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL);</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;factory = CORBA_OBJECT_NIL;</div><div class='del'>-	priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets rid of the factory that a client knows about */</div><div class='del'>-static void</div><div class='del'>-destroy_factory (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;factory, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("destroy_factory(): could not see if the factory was nil");</div><div class='del'>-		priv-&gt;factory = 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'>-	CORBA_Object_release (priv-&gt;factory, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("destroy_factory(): could not release the factory");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	priv-&gt;factory = CORBA_OBJECT_NIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets rid of the listener that a client knows about */</div><div class='del'>-static void</div><div class='del'>-destroy_listener (CalClient *client)</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'>-	if (!priv-&gt;listener)</div><div class='del'>-		return;</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'>-</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 (ev._major != CORBA_NO_EXCEPTION) {</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'>-	Evolution_Calendar_Cal_unref (priv-&gt;cal, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</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 (ev._major != CORBA_NO_EXCEPTION)</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'>-/* 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'>-	destroy_factory (client);</div><div class='del'>-	destroy_listener (client);</div><div class='del'>-	destroy_cal (client);</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</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'>-/* Signal handlers for the listener's signals */</div><div class='del'>-</div><div class='del'>-/* Handle the cal_loaded signal from the listener */</div><div class='del'>-static void</div><div class='del'>-cal_loaded_cb (CalListener *listener,</div><div class='del'>-	       Evolution_Calendar_Listener_LoadStatus status,</div><div class='del'>-	       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'>-	Evolution_Calendar_Cal cal_copy;</div><div class='del'>-	CalClientLoadStatus 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 == LOAD_STATE_LOADING);</div><div class='del'>-</div><div class='del'>-	client_status = CAL_CLIENT_LOAD_ERROR;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case 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 (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_message ("cal_loaded(): could not duplicate the 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 = LOAD_STATE_LOADED;</div><div class='del'>-</div><div class='del'>-		client_status = CAL_CLIENT_LOAD_SUCCESS;</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	case Evolution_Calendar_Listener_ERROR:</div><div class='del'>-		client_status = CAL_CLIENT_LOAD_ERROR;</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	case Evolution_Calendar_Listener_IN_USE:</div><div class='del'>-		client_status = CAL_CLIENT_LOAD_IN_USE;</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	case Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:</div><div class='del'>-		client_status = CAL_CLIENT_LOAD_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'>-	priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;load_state != LOAD_STATE_LOADING);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_LOADED],</div><div class='del'>-			 client_status);</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 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 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'>-</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 the calendar factory of the</div><div class='del'>- * calendar server.</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'>-	Evolution_Calendar_CalFactory factory, factory_copy;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int result;</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'>-#ifdef USING_OAF</div><div class='del'>-	factory = (Evolution_Calendar_CalFactory) oaf_activate_from_id (</div><div class='del'>-		"OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",</div><div class='del'>-		OAF_FLAG_NO_LOCAL, NULL, &amp;ev);</div><div class='del'>-#else</div><div class='del'>-	factory = (Evolution_Calendar_CalFactory) goad_server_activate_with_id (</div><div class='del'>-		NULL,</div><div class='del'>-		"evolution:calendar-factory",</div><div class='del'>-		GOAD_ACTIVATE_REMOTE,</div><div class='del'>-		NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	result = CORBA_Object_is_nil (factory, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_client_construct(): could not see if the factory is 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'>-	if (result) {</div><div class='del'>-		g_message ("cal_client_construct(): could not contact Tlacuache, "</div><div class='del'>-			   "the personal calendar server");</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'>-	factory_copy = CORBA_Object_duplicate (factory, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_client_construct(): could not duplicate the calendar factory");</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;factory = factory_copy;</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'>- * @void:</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_load_calendar() or cal_client_create_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'>-/* Issues a load or create request */</div><div class='del'>-static gboolean</div><div class='del'>-load_or_create (CalClient *client, const char *str_uri, gboolean load)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	Evolution_Calendar_Listener corba_listener;</div><div class='del'>-	CORBA_Environment ev;</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 == LOAD_STATE_NOT_LOADED, FALSE);</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 ();</div><div class='del'>-	if (!priv-&gt;listener) {</div><div class='del'>-		g_message ("load_or_create(): could not create the listener");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;listener), "cal_loaded",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_loaded_cb),</div><div class='del'>-			    client);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;listener), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_updated_cb),</div><div class='del'>-			    client);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;listener), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_removed_cb),</div><div class='del'>-			    client);</div><div class='del'>-</div><div class='del'>-	corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (</div><div class='del'>-		BONOBO_OBJECT (priv-&gt;listener));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = LOAD_STATE_LOADING;</div><div class='del'>-</div><div class='del'>-	if (load)</div><div class='del'>-		Evolution_Calendar_CalFactory_load (priv-&gt;factory, str_uri, corba_listener, &amp;ev);</div><div class='del'>-	else</div><div class='del'>-		Evolution_Calendar_CalFactory_create (priv-&gt;factory, str_uri, corba_listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("load_or_create(): load/create request failed");</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 = LOAD_STATE_NOT_LOADED;</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return FALSE;</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'>- * cal_client_load_calendar:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @str_uri: URI of calendar to load.</div><div class='del'>- *</div><div class='del'>- * Makes a calendar client initiate a request to load a calendar.  The calendar</div><div class='del'>- * client will emit the "cal_loaded" 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 load request.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_load_calendar (CalClient *client, const char *str_uri)</div><div class='del'>-{</div><div class='del'>-	return load_or_create (client, str_uri, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_create_calendar:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @str_uri: URI that will contain the calendar data.</div><div class='del'>- *</div><div class='del'>- * Makes a calendar client initiate a request to create a new calendar.  The</div><div class='del'>- * calendar client will emit the "cal_loaded" signal when the response from the</div><div class='del'>- * server is received.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on failure to issue the create request.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_create_calendar (CalClient *client, const char *str_uri)</div><div class='del'>-{</div><div class='del'>-	return load_or_create (client, str_uri, FALSE);</div><div class='del'>-}</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 == LOAD_STATE_LOADED, -1);</div><div class='del'>-</div><div class='del'>-	t = (((type &amp; CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0)</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0)</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_JOURNAL) ? Evolution_Calendar_TYPE_JOURNAL : 0)</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_OTHER) ? Evolution_Calendar_TYPE_OTHER : 0)</div><div class='del'>-	     /*</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_ANY) ? Evolution_Calendar_TYPE_ANY : 0)</div><div class='del'>-	     */</div><div class='del'>-	     );</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	n = Evolution_Calendar_Cal_get_n_objects (priv-&gt;cal, t, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</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'>- * cal_client_get_object:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @uid: Unique identifier for a calendar object.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for a calendar object based on its unique identifier.</div><div class='del'>- *</div><div class='del'>- * Return value: The string representation of a complete calendar wrapping the</div><div class='del'>- * sought object, or NULL if no object had the specified UID.  A complete</div><div class='del'>- * calendar is returned because you also need the timezone data.</div><div class='del'>- **/</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_get_object (CalClient *client, const char *uid, iCalObject **ico)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_CalObj calobj_str;</div><div class='del'>-	CalClientGetStatus retval;</div><div class='del'>-	CalObjFindStatus status;</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 == LOAD_STATE_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 (ico != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	retval = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-	*ico = NULL;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	calobj_str = Evolution_Calendar_Cal_get_object (priv-&gt;cal, uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major == CORBA_USER_EXCEPTION</div><div class='del'>-	    &amp;&amp; strcmp (CORBA_exception_id (&amp;ev), ex_Evolution_Calendar_Cal_NotFound) == 0)</div><div class='del'>-		goto out;</div><div class='del'>-	else if (ev._major != CORBA_NO_EXCEPTION) {</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'>-	status = ical_object_find_in_string (uid, calobj_str, ico);</div><div class='del'>-	CORBA_free (calobj_str);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_OBJ_FIND_SUCCESS:</div><div class='del'>-		retval = CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_OBJ_FIND_SYNTAX_ERROR:</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_OBJ_FIND_NOT_FOUND:</div><div class='del'>-		retval = CAL_CLIENT_GET_NOT_FOUND;</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'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-#if 0</div><div class='del'>-	icalcomponent* comp = NULL;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-	iCalObject    *ical;</div><div class='del'>-</div><div class='del'>-	/* convert the string into an iCalObject */</div><div class='del'>-	(*ico) = NULL;</div><div class='del'>-	if (obj_str == NULL) return CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-	comp = icalparser_parse_string (obj_str);</div><div class='del'>-	free (obj_str);</div><div class='del'>-	if (!comp) return CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-	subcomp = icalcomponent_get_first_component (comp, ICAL_ANY_COMPONENT);</div><div class='del'>-	if (!subcomp) return CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		ical = ical_object_create_from_icalcomponent (subcomp);</div><div class='del'>-		if (ical-&gt;type != ICAL_EVENT &amp;&amp;</div><div class='del'>-		    ical-&gt;type != ICAL_TODO  &amp;&amp;</div><div class='del'>-		    ical-&gt;type != ICAL_JOURNAL) {</div><div class='del'>-			g_warning ("Skipping unsupported iCalendar component");</div><div class='del'>-		} else {</div><div class='del'>-			if (strcasecmp (ical-&gt;uid, uid) == 0) {</div><div class='del'>-				(*ico) = ical;</div><div class='del'>-				(*ico)-&gt;ref_count = 1;</div><div class='del'>-				return CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		subcomp = icalcomponent_get_next_component (comp,</div><div class='del'>-							   ICAL_ANY_COMPONENT);</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'>- * 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.</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'>-	Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-	GList *uids;</div><div class='del'>-	int 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 == LOAD_STATE_LOADED, NULL);*/</div><div class='del'>-	if (priv-&gt;load_state != LOAD_STATE_LOADED)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	t = (((type &amp; CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0)</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0)</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_JOURNAL) ? Evolution_Calendar_TYPE_JOURNAL : 0)</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_OTHER) ? Evolution_Calendar_TYPE_OTHER : 0)</div><div class='del'>-	     /*</div><div class='del'>-	     | ((type &amp; CALOBJ_TYPE_ANY) ? Evolution_Calendar_TYPE_ANY : 0)</div><div class='del'>-	     */</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'>-	seq = Evolution_Calendar_Cal_get_uids (priv-&gt;cal, t, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</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'>-	/* Create the list */</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'>-	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 CalObjInstance structures from the CORBA sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_object_instance_list (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'>-		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'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_events_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 events 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 #CalObjInstance structures.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_client_get_events_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'>-	Evolution_Calendar_CalObjInstanceSeq *seq;</div><div class='del'>-	GList *events;</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'>-	if (priv-&gt;load_state != LOAD_STATE_LOADED)</div><div class='del'>-		return 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 = Evolution_Calendar_Cal_get_events_in_range (priv-&gt;cal, start, end, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_client_get_events_in_range(): could not get the event 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'>-	events = build_object_instance_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return events;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Translates the CORBA representation of an AlarmType */</div><div class='del'>-static enum AlarmType</div><div class='del'>-uncorba_alarm_type (Evolution_Calendar_AlarmType corba_type)</div><div class='del'>-{</div><div class='del'>-	switch (corba_type) {</div><div class='del'>-	case Evolution_Calendar_MAIL:</div><div class='del'>-		return ALARM_MAIL;</div><div class='del'>-</div><div class='del'>-	case Evolution_Calendar_PROGRAM:</div><div class='del'>-		return ALARM_PROGRAM;</div><div class='del'>-</div><div class='del'>-	case Evolution_Calendar_DISPLAY:</div><div class='del'>-		return ALARM_DISPLAY;</div><div class='del'>-</div><div class='del'>-	case Evolution_Calendar_AUDIO:</div><div class='del'>-		return ALARM_AUDIO;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return ALARM_DISPLAY;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a GList of CalAlarmInstance structures from the CORBA sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *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'>-		Evolution_Calendar_CalAlarmInstance *corba_ai;</div><div class='del'>-		CalAlarmInstance *ai;</div><div class='del'>-</div><div class='del'>-		corba_ai = &amp;seq-&gt;_buffer[i];</div><div class='del'>-		ai = g_new (CalAlarmInstance, 1);</div><div class='del'>-</div><div class='del'>-		ai-&gt;uid = g_strdup (corba_ai-&gt;uid);</div><div class='del'>-		ai-&gt;type = uncorba_alarm_type (corba_ai-&gt;type);</div><div class='del'>-		ai-&gt;trigger = corba_ai-&gt;trigger;</div><div class='del'>-		ai-&gt;occur = corba_ai-&gt;occur;</div><div class='del'>-</div><div class='del'>-		list = g_list_prepend (list, ai);</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'>-</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 #CalAlarmInstance structures.</div><div class='del'>- **/</div><div class='del'>-GList *</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'>-	Evolution_Calendar_CalAlarmInstanceSeq *seq;</div><div class='del'>-	GList *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'>-	if (priv-&gt;load_state != LOAD_STATE_LOADED)</div><div class='del'>-		return 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 = Evolution_Calendar_Cal_get_alarms_in_range (priv-&gt;cal, start, end, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</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_alarm_instance_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_get_alarms_for_object:</div><div class='del'>- * @client: A calendar client.</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'>- * @alarms: Return value for the list of alarm instances.</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'>-				  GList **alarms)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_CalAlarmInstanceSeq *seq;</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'>-	if (priv-&gt;load_state != LOAD_STATE_LOADED)</div><div class='del'>-		return 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'>-	seq = Evolution_Calendar_Cal_get_alarms_for_object (priv-&gt;cal, uid, start, end, &amp;ev);</div><div class='del'>-	if (ev._major == CORBA_USER_EXCEPTION</div><div class='del'>-	    &amp;&amp; strcmp (CORBA_exception_id (&amp;ev), ex_Evolution_Calendar_Cal_NotFound) == 0)</div><div class='del'>-		goto out;</div><div class='del'>-	else if (ev._major != CORBA_NO_EXCEPTION) {</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'>-	retval = TRUE;</div><div class='del'>-	*alarms = build_alarm_instance_list (seq);</div><div class='del'>-	CORBA_free (seq);</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'>- * cal_client_update_object:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @ico: A calendar object.</div><div class='del'>- *</div><div class='del'>- * Asks a calendar to update an object.  Any existing object with the specified</div><div class='del'>- * UID will be replaced.  The client program should not assume that the object</div><div class='del'>- * is actually in the server's storage until it has received the "obj_updated"</div><div class='del'>- * notification signal.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on specifying an invalid object.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_update_object (CalClient *client, iCalObject *ico)</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 == LOAD_STATE_LOADED, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ico != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (ico-&gt;uid != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	obj_string = ical_object_to_string (ico);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Evolution_Calendar_Cal_update_object (priv-&gt;cal, ico-&gt;uid, obj_string, &amp;ev);</div><div class='del'>-	g_free (obj_string);</div><div class='del'>-</div><div class='del'>-	if (ev._major == CORBA_USER_EXCEPTION &amp;&amp;</div><div class='del'>-	    strcmp (CORBA_exception_id (&amp;ev), ex_Evolution_Calendar_Cal_InvalidObject) == 0)</div><div class='del'>-		goto out;</div><div class='del'>-	else if (ev._major != CORBA_NO_EXCEPTION) {</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'>-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 == LOAD_STATE_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'>-	Evolution_Calendar_Cal_remove_object (priv-&gt;cal, uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major == CORBA_USER_EXCEPTION &amp;&amp;</div><div class='del'>-	    strcmp (CORBA_exception_id (&amp;ev), ex_Evolution_Calendar_Cal_NotFound) == 0)</div><div class='del'>-		goto out;</div><div class='del'>-	else if (ev._major != CORBA_NO_EXCEPTION) {</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='head'>diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h<br/>deleted file mode 100644<br/>index 7c67cfba2e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/cal-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-/* Evolution calendar client</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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-util.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'>-/* Load status for the cal_loaded signal */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_LOAD_SUCCESS,</div><div class='del'>-	CAL_CLIENT_LOAD_ERROR,</div><div class='del'>-	CAL_CLIENT_LOAD_IN_USE,</div><div class='del'>-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED</div><div class='del'>-} CalClientLoadStatus;</div><div class='del'>-</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'>-</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'>-	gpointer 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_loaded) (CalClient *client, CalClientLoadStatus status);</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'>-</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'>-gboolean cal_client_load_calendar (CalClient *client, const char *str_uri);</div><div class='del'>-gboolean cal_client_create_calendar (CalClient *client, const char *str_uri);</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'>-					  iCalObject **ico);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_uids (CalClient *client, CalObjType type);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_events_in_range (CalClient *client, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end);</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'>-					   GList **alarms);</div><div class='del'>-</div><div class='del'>-gboolean cal_client_update_object (CalClient *client, iCalObject *ico);</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'>-</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 884d64e8f9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-listener.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/cal-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,402 +0,0 @@</div><div class='del'>-/* Evolution calendar listener</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.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'>-typedef struct {</div><div class='del'>-	/* The calendar this listener refers to */</div><div class='del'>-	Evolution_Calendar_Cal cal;</div><div class='del'>-} CalListenerPrivate;</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_LOADED,</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_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 marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args);</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Calendar_Listener__vepv cal_listener_vepv;</div><div class='del'>-</div><div class='del'>-static guint cal_listener_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalListener 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 #CalListener class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_listener_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_listener_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_listener_type) {</div><div class='del'>-		static const GtkTypeInfo cal_listener_info = {</div><div class='del'>-			"CalListener",</div><div class='del'>-			sizeof (CalListener),</div><div class='del'>-			sizeof (CalListenerClass),</div><div class='del'>-			(GtkClassInitFunc) cal_listener_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_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'>-		cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &amp;cal_listener_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_listener_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CORBA class initialization function for the calendar listener */</div><div class='del'>-static void</div><div class='del'>-init_cal_listener_corba_class (void)</div><div class='del'>-{</div><div class='del'>-	cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	cal_listener_vepv.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();</div><div class='del'>-}</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_object_get_type ());</div><div class='del'>-</div><div class='del'>-	cal_listener_signals[CAL_LOADED] =</div><div class='del'>-		gtk_signal_new ("cal_loaded",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalListenerClass, cal_loaded),</div><div class='del'>-				marshal_cal_loaded,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_ENUM,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-	cal_listener_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 (CalListenerClass, obj_updated),</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_listener_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 (CalListenerClass, obj_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'>-	gtk_object_class_add_signals (object_class, cal_listener_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_listener_destroy;</div><div class='del'>-</div><div class='del'>-	init_cal_listener_corba_class ();</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 = CORBA_OBJECT_NIL;</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'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean result;</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'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	result = CORBA_Object_is_nil (priv-&gt;cal, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("cal_listener_destroy(): could not see if the calendar was NIL");</div><div class='del'>-	else if (!result) {</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'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("cal_listener_destroy(): could not release the calendar");</div><div class='del'>-</div><div class='del'>-		priv-&gt;cal = CORBA_OBJECT_NIL;</div><div class='del'>-	}</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'>-/* Marshalers */</div><div class='del'>-</div><div class='del'>-typedef void (* CalLoadedFunc) (GtkObject *object, gint status, gpointer cal, gpointer data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CalLoadedFunc rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CalLoadedFunc) func;</div><div class='del'>-	(* rfunc) (object, GTK_VALUE_ENUM (args[0]), GTK_VALUE_POINTER (args[1]), data);</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'>-/* Listener::cal_loaded method */</div><div class='del'>-static void</div><div class='del'>-Listener_cal_loaded (PortableServer_Servant servant,</div><div class='del'>-		     Evolution_Calendar_Listener_LoadStatus status,</div><div class='del'>-		     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'>-	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;cal != CORBA_OBJECT_NIL) {</div><div class='del'>-		g_message ("Listener_cal_loaded(): calendar was already loaded!");</div><div class='del'>-		return;</div><div class='del'>-	}</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_cal_loaded(): 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'>-	priv-&gt;cal = cal_copy;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[CAL_LOADED],</div><div class='del'>-			 status, cal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Listener::obj_updated method */</div><div class='del'>-static void</div><div class='del'>-Listener_obj_updated (PortableServer_Servant servant,</div><div class='del'>-		      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'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_UPDATED],</div><div class='del'>-			 uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Listener::obj_removed method */</div><div class='del'>-static void</div><div class='del'>-Listener_obj_removed (PortableServer_Servant servant,</div><div class='del'>-		      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'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_REMOVED],</div><div class='del'>-			 uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_get_epv:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Creates an EPV for the Listener CORBA class.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-allocated EPV.</div><div class='del'>- **/</div><div class='del'>-POA_Evolution_Calendar_Listener__epv *</div><div class='del'>-cal_listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Calendar_Listener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);</div><div class='del'>-	epv-&gt;cal_loaded = Listener_cal_loaded;</div><div class='del'>-	epv-&gt;obj_updated = Listener_obj_updated;</div><div class='del'>-	epv-&gt;obj_removed = Listener_obj_removed;</div><div class='del'>-	return epv;</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'>- * @corba_listener: CORBA object for the calendar listener.</div><div class='del'>- *</div><div class='del'>- * Constructs a calendar listener by binding the corresponding CORBA object to</div><div class='del'>- * it.</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, Evolution_Calendar_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_CAL_LISTENER (listener), NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener);</div><div class='del'>-	return listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_corba_object_create:</div><div class='del'>- * @object: #BonoboObject that will wrap the CORBA object.</div><div class='del'>- *</div><div class='del'>- * Creates and activates the CORBA object that is wrapped by the specified</div><div class='del'>- * calendar listener @object.</div><div class='del'>- *</div><div class='del'>- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of</div><div class='del'>- * failure.</div><div class='del'>- **/</div><div class='del'>-Evolution_Calendar_Listener</div><div class='del'>-cal_listener_corba_object_create (BonoboObject *object)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Calendar_Listener *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;cal_listener_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_Evolution_Calendar_Listener__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'>-	return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_new:</div><div class='del'>- * @void:</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, or NULL if its corresponding</div><div class='del'>- * CORBA object could not be created.</div><div class='del'>- **/</div><div class='del'>-CalListener *</div><div class='del'>-cal_listener_new (void)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_Listener corba_listener;</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	listener = gtk_type_new (CAL_LISTENER_TYPE);</div><div class='del'>-</div><div class='del'>-	corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	result = CORBA_Object_is_nil (corba_listener, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION || result) {</div><div class='del'>-		g_message ("cal_listener_new(): could not create the CORBA listener");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener));</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'>-	return cal_listener_construct (listener, corba_listener);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_get_calendar:</div><div class='del'>- * @listener: A calendar listener.</div><div class='del'>- * </div><div class='del'>- * Queries the calendar that a listener is watching.</div><div class='del'>- * </div><div class='del'>- * Return value: The calendar that the listener is watching.</div><div class='del'>- **/</div><div class='del'>-Evolution_Calendar_Cal</div><div class='del'>-cal_listener_get_calendar (CalListener *listener)</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, CORBA_OBJECT_NIL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_LISTENER (listener), CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-	return priv-&gt;cal;</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 171da0d5c3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-listener.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/cal-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* Evolution calendar listener</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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-object.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 _CalListener CalListener;</div><div class='del'>-typedef struct _CalListenerClass CalListenerClass;</div><div class='del'>-</div><div class='del'>-struct _CalListener {</div><div class='del'>-	BonoboObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalListenerClass {</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 (* cal_loaded) (CalListener *listener,</div><div class='del'>-			     Evolution_Calendar_Listener_LoadStatus status,</div><div class='del'>-			     Evolution_Calendar_Cal cal);</div><div class='del'>-	void (* obj_updated) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);</div><div class='del'>-	void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);</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'>-				     Evolution_Calendar_Listener corba_listener);</div><div class='del'>-</div><div class='del'>-Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);</div><div class='del'>-</div><div class='del'>-CalListener *cal_listener_new (void);</div><div class='del'>-</div><div class='del'>-Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);</div><div class='del'>-</div><div class='del'>-POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (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/cal-client/client-test.c b/calendar/cal-client/client-test.c<br/>deleted file mode 100644<br/>index f8741f4539..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/client-test.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-client/client-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,211 +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;bonobo.h&gt;</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'>-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'>-/* 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'>-			iCalObject *ico;</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;ico);</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_icalobject (ico);</div><div class='del'>-				printf ("------------------------------\n");</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'>-			// cal_client_update_object (client, uid, calobj);</div><div class='del'>-			// g_free (calobj);</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 loaded */</div><div class='del'>-static void</div><div class='del'>-cal_loaded (CalClient *client, CalClientLoadStatus 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_LOAD_SUCCESS) ? "success" :</div><div class='del'>-		    (status == CAL_CLIENT_LOAD_ERROR) ? "error" :</div><div class='del'>-		    (status == CAL_CLIENT_LOAD_IN_USE) ? "in use" :</div><div class='del'>-		    "unknown status value"));</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_LOAD_SUCCESS)</div><div class='del'>-		g_idle_add (list_uids, client);</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 (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'>-/* Creates a calendar client and tries to load the specified URI into it */</div><div class='del'>-static CalClient *</div><div class='del'>-create_client (const char *uri, gboolean load)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</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), "cal_loaded",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_loaded),</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),</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'>-	if (load)</div><div class='del'>-		result = cal_client_load_calendar (client, uri);</div><div class='del'>-	else</div><div class='del'>-		result = cal_client_create_calendar (client, uri);</div><div class='del'>-</div><div class='del'>-	if (!result) {</div><div class='del'>-		g_message ("create_client(): failure when issuing calendar %s request `%s'",</div><div class='del'>-			   load ? "load" : "create",</div><div class='del'>-			   uri);</div><div class='del'>-		exit (1);</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'>-/* 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'>-#ifdef USING_OAF</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</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 ("tl-test", VERSION, *argc, argv);</div><div class='del'>-	oaf_init (*argc, argv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</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'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	gnome_CORBA_init ("tl-test", VERSION, &amp;argc, argv, 0, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("main(): could not initialize the ORB");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		exit (1);</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'>-#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'>-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-	init_corba (&amp;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'>-	client1 = create_client ("/cvs/evolution/calendar/gui/test2.vcf", TRUE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client1), "destroy",</div><div class='del'>-			    client_destroy_cb,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	client2 = create_client ("/cvs/evolution/calendar/gui/test2.vcf", FALSE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client2), "destroy",</div><div class='del'>-			    client_destroy_cb,</div><div class='del'>-			    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/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore<br/>deleted file mode 100644<br/>index edf21e8e74..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +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='del'>-icalendar-test</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 92302f9e1b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS = test-recur icalendar-test</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\</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'>-        $(GNOME_INCLUDEDIR)</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-recur.c		\</div><div class='del'>-	cal-util.c		\</div><div class='del'>-	calobj.c		\</div><div class='del'>-	icalendar.c		\</div><div class='del'>-	icalendar.h		\</div><div class='del'>-	icalendar-save.c	\</div><div class='del'>-	icalendar-save.h	\</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-recur.h		\</div><div class='del'>-	cal-util.h		\</div><div class='del'>-	calobj.h		\</div><div class='del'>-	timeutil.h</div><div class='del'>-</div><div class='del'>-icalendar_test_SOURCES =	\</div><div class='del'>-	icalendar-test.c	\</div><div class='del'>-	icalendar.c		\</div><div class='del'>-	icalendar-save.c</div><div class='del'>-</div><div class='del'>-icalendar_test_LDADD =						\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la			\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical.a</div><div class='del'>-</div><div class='del'>-#	$(top_builddir)/calendar/cal-util/libcal-util.la	\</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.la		\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical.a	\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</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 d5ea774e9b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-recur.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/cal-recur.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2811 +0,0 @@</div><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 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Damon Chaplin &lt;damon@helixcode.com&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'>-#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/calobj.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'>-</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'>-	CalObjRecurrence *recur;</div><div class='del'>-</div><div class='del'>-	/* This is used for the WEEKLY frequency. */</div><div class='del'>-	gint weekday;</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[61];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</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 _CalObjRecurVTable CalObjRecurVTable;</div><div class='del'>-struct _CalObjRecurVTable {</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_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'>-static gboolean cal_object_generate_events_for_year (iCalObject	*ico,</div><div class='del'>-						     CalObjTime	*event_start,</div><div class='del'>-						     CalObjTime	*interval_start,</div><div class='del'>-						     CalObjTime	*interval_end,</div><div class='del'>-						     time_t	 interval_start_time,</div><div class='del'>-						     time_t	 interval_end_time,</div><div class='del'>-						     gint	 duration_days,</div><div class='del'>-						     gint	 duration_seconds,</div><div class='del'>-						     calendarfn  cb,</div><div class='del'>-						     void	*closure);</div><div class='del'>-</div><div class='del'>-static GArray*	cal_obj_generate_set_yearly	(RecurData	*recur_data,</div><div class='del'>-						 CalObjRecurVTable *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'>-						 CalObjRecurVTable *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'>-						 CalObjRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalObjRecurVTable* cal_obj_get_vtable	(CalObjRecurType	 recur_type);</div><div class='del'>-static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,</div><div class='del'>-						 CalObjRecurrence	*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		(CalObjRecurrence	*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_subtract_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'>-						 CalObjRecurrence *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'>-</div><div class='del'>-</div><div class='del'>-CalObjRecurVTable 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'>-CalObjRecurVTable 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'>-CalObjRecurVTable 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'>-CalObjRecurVTable 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'>-CalObjRecurVTable 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'>-CalObjRecurVTable 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'>-CalObjRecurVTable 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'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the event between</div><div class='del'>- * the given start and end times. If end is 0 it continues until the event</div><div class='del'>- * ends or forever if the event has an infinite recurrence rule.</div><div class='del'>- * If the callback routine return 0 the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * NOTE: This could replace ical_object_generate_events() eventually.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_object_generate_events (iCalObject	*ico,</div><div class='del'>-			    time_t	 start,</div><div class='del'>-			    time_t	 end,</div><div class='del'>-			    calendarfn   cb,</div><div class='del'>-			    void	*closure)</div><div class='del'>-{</div><div class='del'>-	CalObjTime interval_start, interval_end, event_start;</div><div class='del'>-	CalObjTime chunk_start, chunk_end;</div><div class='del'>-	gint days, seconds, year;</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 (!ico-&gt;recur) {</div><div class='del'>-		if ((end &amp;&amp; ico-&gt;dtstart &lt; end &amp;&amp; ico-&gt;dtend &gt; start)</div><div class='del'>-		    || (end == 0 &amp;&amp; ico-&gt;dtend &gt; start)) {</div><div class='del'>-			(* cb) (ico, ico-&gt;dtstart, ico-&gt;dtend, closure);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the interval start &amp; end to CalObjTime. */</div><div class='del'>-	cal_object_time_from_time (&amp;interval_start, start);</div><div class='del'>-	cal_object_time_from_time (&amp;interval_end, end);</div><div class='del'>-</div><div class='del'>-	cal_object_time_from_time (&amp;event_start, ico-&gt;dtstart);</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. We also don't want to just</div><div class='del'>-	   use the number of seconds, since leap seconds will then cause a</div><div class='del'>-	   problem. So we want a value of days + seconds. */</div><div class='del'>-	cal_object_compute_duration (&amp;interval_start, &amp;interval_end,</div><div class='del'>-				     &amp;days, &amp;seconds);</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. */</div><div class='del'>-	for (year = interval_start.year; year &lt;= interval_end.year; year++) {</div><div class='del'>-		chunk_start = interval_start;</div><div class='del'>-		chunk_start.year = year;</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    = 0;</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 (year != interval_end.year) {</div><div class='del'>-			chunk_end.year++;</div><div class='del'>-			chunk_end.month  = 0;</div><div class='del'>-			chunk_end.day    = 0;</div><div class='del'>-			chunk_end.hour   = 0;</div><div class='del'>-			chunk_end.minute = 0;</div><div class='del'>-			chunk_end.second = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!cal_object_generate_events_for_year (ico, &amp;event_start,</div><div class='del'>-							  &amp;interval_start,</div><div class='del'>-							  &amp;interval_end,</div><div class='del'>-							  start, end,</div><div class='del'>-							  days, seconds,</div><div class='del'>-							  cb, closure))</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 gboolean</div><div class='del'>-cal_object_generate_events_for_year (iCalObject	*ico,</div><div class='del'>-				     CalObjTime	*event_start,</div><div class='del'>-				     CalObjTime	*interval_start,</div><div class='del'>-				     CalObjTime	*interval_end,</div><div class='del'>-				     time_t	 interval_start_time,</div><div class='del'>-				     time_t	 interval_end_time,</div><div class='del'>-				     gint	 duration_days,</div><div class='del'>-				     gint	 duration_seconds,</div><div class='del'>-				     calendarfn  cb,</div><div class='del'>-				     void	*closure)</div><div class='del'>-{</div><div class='del'>-	GArray *occs, *ex_occs, *tmp_occs;</div><div class='del'>-	CalObjTime cotime, *occ;</div><div class='del'>-	CalObjRecurrence *recur;</div><div class='del'>-	GList *rrules = NULL, *rdates = NULL, *exrules = NULL, *exdates = NULL;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint i, status;</div><div class='del'>-	time_t occ_time, start_time, end_time;</div><div class='del'>-	struct tm start_tm, end_tm;</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'>-</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'>-		recur = elem-&gt;data;</div><div class='del'>-		tmp_occs = cal_obj_expand_recurrence (event_start, recur,</div><div class='del'>-						      interval_start,</div><div class='del'>-						      interval_end);</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 occurrence dates. */</div><div class='del'>-	for (elem = rdates; elem; elem = elem-&gt;next) {</div><div class='del'>-		occ_time = (*(time_t*)elem-&gt;data);</div><div class='del'>-		cal_object_time_from_time (&amp;cotime, occ_time);</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'>-		recur = elem-&gt;data;</div><div class='del'>-		tmp_occs = cal_obj_expand_recurrence (event_start, recur,</div><div class='del'>-						      interval_start,</div><div class='del'>-						      interval_end);</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'>-		occ_time = (*(time_t*)elem-&gt;data);</div><div class='del'>-		cal_object_time_from_time (&amp;cotime, occ_time);</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 both 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'>-	/* 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'>-</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'>-</div><div class='del'>-		start_tm.tm_year = occ-&gt;year - 1900;</div><div class='del'>-		start_tm.tm_mon  = occ-&gt;month;</div><div class='del'>-		start_tm.tm_mday = occ-&gt;day;</div><div class='del'>-		start_tm.tm_hour = occ-&gt;hour;</div><div class='del'>-		start_tm.tm_min  = occ-&gt;minute;</div><div class='del'>-		start_tm.tm_sec  = occ-&gt;second;</div><div class='del'>-		start_time = mktime (&amp;start_tm);</div><div class='del'>-</div><div class='del'>-		if (start_time &lt; ico-&gt;dtstart</div><div class='del'>-		    || start_time &gt;= interval_end_time)</div><div class='del'>-			continue;</div><div class='del'>-</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'>-		end_tm.tm_year = occ-&gt;year - 1900;</div><div class='del'>-		end_tm.tm_mon  = occ-&gt;month;</div><div class='del'>-		end_tm.tm_mday = occ-&gt;day;</div><div class='del'>-		end_tm.tm_hour = occ-&gt;hour;</div><div class='del'>-		end_tm.tm_min  = occ-&gt;minute;</div><div class='del'>-		end_tm.tm_sec  = occ-&gt;second;</div><div class='del'>-		end_time = mktime (&amp;end_tm);</div><div class='del'>-</div><div class='del'>-		if (end_time &lt; interval_start_time)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		status = (*cb) (ico, start_time, end_time, closure);</div><div class='del'>-		if (status == 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'>-</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'>-GArray*</div><div class='del'>-cal_obj_expand_recurrence		(CalObjTime	  *event_start,</div><div class='del'>-					 CalObjRecurrence *recur,</div><div class='del'>-					 CalObjTime	  *interval_start,</div><div class='del'>-					 CalObjTime	  *interval_end)</div><div class='del'>-{</div><div class='del'>-	CalObjRecurVTable *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'>-	vtable = cal_obj_get_vtable (recur-&gt;type);</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'>-	/* 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) {</div><div class='del'>-		cal_object_time_from_time (&amp;event_end_cotime,</div><div class='del'>-					   recur-&gt;enddate);</div><div class='del'>-		event_end = &amp;event_end_cotime;</div><div class='del'>-	}</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;type) {</div><div class='del'>-		case CAL_RECUR_YEARLY:</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 CAL_RECUR_MONTHLY:</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'>-				 CalObjRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	CalObjRecurrence *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. */</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'>-</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'>-				 CalObjRecurVTable *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'>-				 CalObjRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	GArray *occs;</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, 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'>-	/* 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 CalObjRecurVTable*</div><div class='del'>-cal_obj_get_vtable (CalObjRecurType recur_type)</div><div class='del'>-{</div><div class='del'>-	switch (recur_type) {</div><div class='del'>-	case CAL_RECUR_YEARLY:</div><div class='del'>-		return &amp;cal_obj_yearly_vtable;</div><div class='del'>-	case CAL_RECUR_MONTHLY:</div><div class='del'>-		return &amp;cal_obj_monthly_vtable;</div><div class='del'>-	case CAL_RECUR_WEEKLY:</div><div class='del'>-		return &amp;cal_obj_weekly_vtable;</div><div class='del'>-	case CAL_RECUR_DAILY:</div><div class='del'>-		return &amp;cal_obj_daily_vtable;</div><div class='del'>-	case CAL_RECUR_HOURLY:</div><div class='del'>-		return &amp;cal_obj_hourly_vtable;</div><div class='del'>-	case CAL_RECUR_MINUTELY:</div><div class='del'>-		return &amp;cal_obj_minutely_vtable;</div><div class='del'>-	case CAL_RECUR_SECONDLY:</div><div class='del'>-		return &amp;cal_obj_secondly_vtable;</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'>-/* 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'>-			       CalObjRecurrence *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 = cal_obj_time_weekday (event_start, 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;</div><div class='del'>-	gint i, j = 0, cmp, ex_index, occs_len, ex_occs_len;</div><div class='del'>-	gboolean keep_occ;</div><div class='del'>-</div><div class='del'>-	if (occs-&gt;len == 0 || ex_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'>-	ex_occ = &amp;g_array_index (ex_occs, CalObjTime, ex_index);</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'>-		} else if (ex_occ) {</div><div class='del'>-			/* Step through the exceptions until we come to one</div><div class='del'>-			   that matches or follows this occurrence. */</div><div class='del'>-			while (ex_occ) {</div><div class='del'>-				cmp = cal_obj_time_compare_func (ex_occ, occ);</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 ex_occ</div><div class='del'>-				   to NULL when we reach the 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,</div><div class='del'>-								 CalObjTime,</div><div class='del'>-								 ex_index);</div><div class='del'>-				else</div><div class='del'>-					ex_occ = NULL;</div><div class='del'>-</div><div class='del'>-				/* If the current exception matches this</div><div class='del'>-				   occurrence we remove it. */</div><div class='del'>-				if (cmp == 0) {</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'>-		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'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bysetpos_filter (CalObjRecurrence *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'>-</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;</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;</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 = cal_obj_time_weekday (interval_start,</div><div class='del'>-						       recur_data-&gt;recur);</div><div class='del'>-	interval_start_julian -= interval_start_weekday;</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_subtract_days (&amp;week_start, recur_data-&gt;weekday);</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_subtract_days (&amp;week_start, recur_data-&gt;weekday);</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_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_subtract_days (&amp;cotime,</div><div class='del'>-							    -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_subtract_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_subtract_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'>-				occ-&gt;month = 0;</div><div class='del'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ, recur_data-&gt;recur);</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'>-				occ-&gt;month = 0;</div><div class='del'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ, recur_data-&gt;recur);</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'>-				occ-&gt;month = 11;</div><div class='del'>-				occ-&gt;day = 31;</div><div class='del'>-				last_weekday = cal_obj_time_weekday (occ, recur_data-&gt;recur);</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_subtract_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'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ, recur_data-&gt;recur);</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'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ, recur_data-&gt;recur);</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'>-				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, recur_data-&gt;recur);</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_subtract_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 current_weekday;</div><div class='del'>-	gint day_of_week, new_day_of_week, days_to_add;</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'>-			current_weekday = cal_obj_time_weekday (occ, recur_data-&gt;recur);</div><div class='del'>-			day_of_week = (current_weekday + 7</div><div class='del'>-				       - recur_data-&gt;recur-&gt;week_start_day) % 7;</div><div class='del'>-			new_day_of_week = (weekday + 7</div><div class='del'>-					   - recur_data-&gt;recur-&gt;week_start_day) % 7;</div><div class='del'>-			days_to_add = new_day_of_week - day_of_week;</div><div class='del'>-			if (days_to_add &gt; 0)</div><div class='del'>-				cal_obj_time_add_days (occ, days_to_add);</div><div class='del'>-			else if (days_to_add &lt; 0)</div><div class='del'>-				cal_obj_time_subtract_days (occ, -days_to_add);</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, recur_data-&gt;recur);</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 number of months to the given CalObjTime, updating the year</div><div class='del'>-   appropriately so we end up with a valid month. Note that the day may be</div><div class='del'>-   invalid. */</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;</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;year += month / 12;</div><div class='del'>-	cotime-&gt;month = month % 12;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive number of days to the given CalObjTime, updating the month</div><div class='del'>-   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'>-	guint 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 = (guint) cotime-&gt;day;</div><div class='del'>-	day += days;</div><div class='del'>-</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'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Subtracts a positive number of days from the given CalObjTime, updating the</div><div class='del'>-   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_subtract_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 gint to avoid overflow on the guint8. */</div><div class='del'>-	day = (gint) cotime-&gt;day;</div><div class='del'>-	day -= days;</div><div class='del'>-</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'>-</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'>-/* Adds a positive number of hours to the given CalObjTime, updating the day,</div><div class='del'>-   month &amp; year appropriately so we end up with a valid 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'>-	guint hour;</div><div class='del'>-</div><div class='del'>-	/* We use a guint 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;= 24)</div><div class='del'>-		cal_obj_time_add_days (cotime, hour / 24);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive number of minutes to the given CalObjTime, updating the</div><div class='del'>-   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'>-	guint minute;</div><div class='del'>-</div><div class='del'>-	/* We use a guint 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;= 60)</div><div class='del'>-		cal_obj_time_add_hours (cotime, minute / 60);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive number of seconds to the given CalObjTime, updating the</div><div class='del'>-   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'>-	guint second;</div><div class='del'>-</div><div class='del'>-	/* We use a guint 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;= 60)</div><div class='del'>-		cal_obj_time_add_minutes (cotime, second / 60);</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'>-</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'>-	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 (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 (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'>-/* 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		(CalObjTime *cotime,</div><div class='del'>-				 CalObjRecurrence *recur)</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'>-	/* 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'>-	weekday = (weekday + 7 - recur-&gt;week_start_day) % 7;</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 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, offset;</div><div class='del'>-</div><div class='del'>-	/* Find out the weekday of the 1st of the year. */</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'>-</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'>-	/* Calculate the first day of the year that starts a new week. */</div><div class='del'>-	week_start_day = recur_data-&gt;recur-&gt;week_start_day;</div><div class='del'>-	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 (offset &gt;= 4)</div><div class='del'>-		offset -= 7;</div><div class='del'>-</div><div class='del'>-	/* Now move to the required day. */</div><div class='del'>-	offset += (recur_data-&gt;weekday + 7 - week_start_day) % 7;</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'>-	if (offset &gt; 0)</div><div class='del'>-		cal_obj_time_add_days (cotime, offset);</div><div class='del'>-	else</div><div class='del'>-		cal_obj_time_subtract_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'>-{</div><div class='del'>-	struct tm *tmp_tm;</div><div class='del'>-	time_t tmp_time_t;</div><div class='del'>-</div><div class='del'>-	tmp_time_t = t;</div><div class='del'>-	tmp_tm = localtime (&amp;tmp_time_t);</div><div class='del'>-</div><div class='del'>-	cotime-&gt;year   = tmp_tm-&gt;tm_year + 1900;</div><div class='del'>-	cotime-&gt;month  = tmp_tm-&gt;tm_mon;</div><div class='del'>-	cotime-&gt;day    = tmp_tm-&gt;tm_mday;</div><div class='del'>-	cotime-&gt;hour   = tmp_tm-&gt;tm_hour;</div><div class='del'>-	cotime-&gt;minute = tmp_tm-&gt;tm_min;</div><div class='del'>-	cotime-&gt;second = tmp_tm-&gt;tm_sec;</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 391fbfd491..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-recur.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/cal-recur.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><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 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Damon Chaplin &lt;damon@helixcode.com&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'>-#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 "calobj.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME: I've put modified versions of RecurType and Recurrence here, since</div><div class='del'>-   the ones in calobj.h don't support all of iCalendar. Hopefully Seth will</div><div class='del'>-   update those soon and these can be removed. */</div><div class='del'>-</div><div class='del'>-typedef enum {</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'>-} CalObjRecurType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalObjRecurType	type;</div><div class='del'>-</div><div class='del'>-	int            interval;</div><div class='del'>-</div><div class='del'>-	/* Specifies the end of the recurrence. No occurrences are generated</div><div class='del'>-	   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'>-} CalObjRecurrence;</div><div class='del'>-</div><div class='del'>-</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 60 for leap second) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This will eventually replace ical_object_generate_events(). */</div><div class='del'>-void	cal_object_generate_events	(iCalObject	*ico,</div><div class='del'>-					 time_t		 start,</div><div class='del'>-					 time_t		 end,</div><div class='del'>-					 calendarfn	 cb,</div><div class='del'>-					 void		*closure);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is an internal function, only here for testing. */</div><div class='del'>-GArray* cal_obj_expand_recurrence	(CalObjTime	*event_start,</div><div class='del'>-					 CalObjRecurrence *recur,</div><div class='del'>-					 CalObjTime	*interval_start,</div><div class='del'>-					 CalObjTime	*interval_end);</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-util.c b/calendar/cal-util/cal-util.c<br/>deleted file mode 100644<br/>index 40c4fe5bfe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-util.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/cal-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* Evolution calendar utilities and types</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include "cal-util.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'>-/**</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_alarm_instance_list_free:</div><div class='del'>- * @list: List of #CalAlarmInstance structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of #CalAlarmInstance structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_alarm_instance_list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	CalAlarmInstance *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='head'>diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h<br/>deleted file mode 100644<br/>index b222ea8cba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-util.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/cal-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* Evolution calendar utilities and types</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.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'>-/* Instance of an alarm trigger */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;			/* UID of object */</div><div class='del'>-	enum AlarmType type;		/* Type of alarm */</div><div class='del'>-	time_t trigger;			/* Alarm trigger time */</div><div class='del'>-	time_t occur;			/* Occurrence time */</div><div class='del'>-} CalAlarmInstance;</div><div class='del'>-</div><div class='del'>-void cal_alarm_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_OTHER   = 1 &lt;&lt; 3,</div><div class='del'>-	CALOBJ_TYPE_ANY     = 0x0f</div><div class='del'>-} CalObjType;</div><div class='del'>-</div><div class='del'>-void cal_obj_uid_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='head'>diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c<br/>deleted file mode 100644<br/>index 6402937938..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/calobj.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/calobj.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1998 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Calendar objects implementations.</div><div class='del'>- * Copyright (C) 1998 the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Miguel de Icaza (miguel@gnu.org)</div><div class='del'>- *   Federico Mena (quartic@gimp.org)</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;ctype.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 "calobj.h"</div><div class='del'>-#include "timeutil.h"</div><div class='del'>-#include "libversit/vcc.h"</div><div class='del'>-#include "icalendar-save.h"</div><div class='del'>-#include "icalendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* VCalendar product ID */</div><div class='del'>-#define PRODID "-//Helix Code//NONSGML Evolution Calendar//EN"</div><div class='del'>-</div><div class='del'>-static gint compare_exdates (gconstpointer a, gconstpointer b);</div><div class='del'>-static void ical_object_normalize_summary (iCalObject *ico);</div><div class='del'>-static void list_free (GList *list);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-ical_gen_uid (void)</div><div class='del'>-{</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'>-		char buffer [128];</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 = g_strdup (buffer);</div><div class='del'>-		else</div><div class='del'>-			hostname = g_strdup ("localhost");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_strdup_printf (</div><div class='del'>-		"%s-%d-%d-%d-%d@%s",</div><div class='del'>-		isodate_from_time_t (t),</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'>-}</div><div class='del'>-</div><div class='del'>-iCalObject *</div><div class='del'>-ical_object_new (void)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = g_new0 (iCalObject, 1);</div><div class='del'>-</div><div class='del'>-	ico-&gt;seq = -1;</div><div class='del'>-	ico-&gt;dtstamp = time (NULL);</div><div class='del'>-	ico-&gt;uid = ical_gen_uid ();</div><div class='del'>-</div><div class='del'>-	ico-&gt;pilot_id = 0;</div><div class='del'>-	ico-&gt;pilot_status = ICAL_PILOT_SYNC_MOD;</div><div class='del'>-</div><div class='del'>-	ico-&gt;ref_count = 1;</div><div class='del'>-</div><div class='del'>-	return ico;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-iCalObject *</div><div class='del'>-ical_new (char *comment, char *organizer, char *summary)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = ical_object_new ();</div><div class='del'>-</div><div class='del'>-	ico-&gt;comment   = g_strdup (comment);</div><div class='del'>-	ico-&gt;organizer = g_new0 (iCalPerson, 1);</div><div class='del'>-	ico-&gt;organizer-&gt;addr = g_strdup (organizer);</div><div class='del'>-	ico-&gt;summary   = g_strdup (summary);</div><div class='del'>-	ico-&gt;class     = g_strdup ("PUBLIC");</div><div class='del'>-	ico-&gt;status    = g_strdup ("NEEDS ACTION");</div><div class='del'>-</div><div class='del'>-	ico-&gt;dalarm.type = ALARM_DISPLAY;</div><div class='del'>-	ico-&gt;palarm.type = ALARM_PROGRAM;</div><div class='del'>-	ico-&gt;malarm.type = ALARM_MAIL;</div><div class='del'>-	ico-&gt;aalarm.type = ALARM_AUDIO;</div><div class='del'>-</div><div class='del'>-	ical_object_normalize_summary (ico);</div><div class='del'>-</div><div class='del'>-	return ico;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-ical_object_ref (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	ico-&gt;ref_count++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define free_if_defined(x) if (x){ g_free (x); x = 0; }</div><div class='del'>-#define lfree_if_defined(x) if (x){ list_free (x); x = 0; }</div><div class='del'>-static void</div><div class='del'>-ical_object_destroy (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	/* Regular strings */</div><div class='del'>-	free_if_defined  (ico-&gt;comment);</div><div class='del'>-	free_if_defined  (ico-&gt;organizer);</div><div class='del'>-	free_if_defined  (ico-&gt;summary);</div><div class='del'>-	free_if_defined  (ico-&gt;uid);</div><div class='del'>-	free_if_defined  (ico-&gt;status);</div><div class='del'>-	free_if_defined  (ico-&gt;class);</div><div class='del'>-	free_if_defined  (ico-&gt;url);</div><div class='del'>-	free_if_defined  (ico-&gt;recur);</div><div class='del'>-</div><div class='del'>-	/* Lists */</div><div class='del'>-	lfree_if_defined (ico-&gt;exdate);</div><div class='del'>-	lfree_if_defined (ico-&gt;categories);</div><div class='del'>-	lfree_if_defined (ico-&gt;resources);</div><div class='del'>-	lfree_if_defined (ico-&gt;related);</div><div class='del'>-	lfree_if_defined (ico-&gt;attach);</div><div class='del'>-</div><div class='del'>-	/* Alarms */</div><div class='del'>-	g_free (ico-&gt;dalarm.data);</div><div class='del'>-	g_free (ico-&gt;palarm.data);</div><div class='del'>-	g_free (ico-&gt;malarm.data);</div><div class='del'>-	g_free (ico-&gt;aalarm.data);</div><div class='del'>-</div><div class='del'>-	g_free (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-ical_object_unref (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	ico-&gt;ref_count--;</div><div class='del'>-	if (ico-&gt;ref_count == 0)</div><div class='del'>-		ical_object_destroy (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-my_free (gpointer data, gpointer user_dat_ignored)</div><div class='del'>-{</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'>-list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	g_list_foreach (list, my_free, 0);</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This resets any recurrence rules of the iCalObject. */</div><div class='del'>-void</div><div class='del'>-ical_object_reset_recurrence (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	free_if_defined  (ico-&gt;recur);</div><div class='del'>-	lfree_if_defined (ico-&gt;exdate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-set_list (char *str)</div><div class='del'>-{</div><div class='del'>-	GList *list = 0;</div><div class='del'>-	char *s;</div><div class='del'>-</div><div class='del'>-	for (s = strtok (str, ";"); s; s = strtok (NULL, ";"))</div><div class='del'>-		list = g_list_prepend (list, g_strdup (s));</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-set_date_list (char *str)</div><div class='del'>-{</div><div class='del'>-	GList *list = 0;</div><div class='del'>-	char *s;</div><div class='del'>-</div><div class='del'>-	for (s = strtok (str, ";,"); s; s = strtok (NULL, ";,")){</div><div class='del'>-		time_t *t = g_new (time_t, 1);</div><div class='del'>-</div><div class='del'>-		while (*s &amp;&amp; isspace (*s))</div><div class='del'>-			s++;</div><div class='del'>-		*t = time_from_isodate (s);</div><div class='del'>-		list = g_list_prepend (list, t);</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'>-ical_object_add_exdate (iCalObject *o, time_t t)</div><div class='del'>-{</div><div class='del'>-	time_t *pt = g_new (time_t, 1);</div><div class='del'>-</div><div class='del'>-	*pt = t;</div><div class='del'>-	o-&gt;exdate = g_list_prepend (o-&gt;exdate, pt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ignore_space(char **str)</div><div class='del'>-{</div><div class='del'>-	while (**str &amp;&amp; isspace (**str))</div><div class='del'>-		(*str)++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-skip_numbers (char **str)</div><div class='del'>-{</div><div class='del'>-	while (**str){</div><div class='del'>-		ignore_space (str);</div><div class='del'>-		if (!isdigit (**str))</div><div class='del'>-			return;</div><div class='del'>-		while (**str &amp;&amp; isdigit (**str))</div><div class='del'>-			(*str)++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-weekdaylist (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct {</div><div class='del'>-		char first_letter, second_letter;</div><div class='del'>-		int  index;</div><div class='del'>-	} days [] = {</div><div class='del'>-		{ 'S', 'U', 0 },</div><div class='del'>-		{ 'M', 'O', 1 },</div><div class='del'>-		{ 'T', 'U', 2 },</div><div class='del'>-		{ 'W', 'E', 3 },</div><div class='del'>-		{ 'T', 'H', 4 },</div><div class='del'>-		{ 'F', 'R', 5 },</div><div class='del'>-		{ 'S', 'A', 6 }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ignore_space (str);</div><div class='del'>-	do {</div><div class='del'>-		for (i = 0; i &lt; 7; i++){</div><div class='del'>-			if (**str == days [i].first_letter &amp;&amp; *(*str+1) == days [i].second_letter){</div><div class='del'>-				o-&gt;recur-&gt;weekday |= 1 &lt;&lt; i;</div><div class='del'>-				*str += 2;</div><div class='del'>-				if (**str == ' ')</div><div class='del'>-					(*str)++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (isalpha (**str));</div><div class='del'>-</div><div class='del'>-	if (o-&gt;recur-&gt;weekday == 0){</div><div class='del'>-		struct tm tm = *localtime (&amp;o-&gt;dtstart);</div><div class='del'>-</div><div class='del'>-		o-&gt;recur-&gt;weekday = 1 &lt;&lt; tm.tm_wday;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-weekdaynum (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct {</div><div class='del'>-		char first_letter, second_letter;</div><div class='del'>-		int  index;</div><div class='del'>-	} days [] = {</div><div class='del'>-		{ 'S', 'U', 0 },</div><div class='del'>-		{ 'M', 'O', 1 },</div><div class='del'>-		{ 'T', 'U', 2 },</div><div class='del'>-		{ 'W', 'E', 3 },</div><div class='del'>-		{ 'T', 'H', 4 },</div><div class='del'>-		{ 'F', 'R', 5 },</div><div class='del'>-		{ 'S', 'A', 6 }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ignore_space (str);</div><div class='del'>-	do {</div><div class='del'>-		for (i = 0; i &lt; 7; i++){</div><div class='del'>-			if (**str == days [i].first_letter &amp;&amp; *(*str+1) == days [i].second_letter){</div><div class='del'>-				o-&gt;recur-&gt;weekday = i;</div><div class='del'>-				*str += 2;</div><div class='del'>-				if (**str == ' ')</div><div class='del'>-					(*str)++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (isalpha (**str));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ocurrencelist (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	ignore_space (str);</div><div class='del'>-	p = *str;</div><div class='del'>-	if (!isdigit (*p))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(*p &gt;= '1' &amp;&amp; *p &lt;= '5'))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(*(p+1) == '+' || *(p+1) == '-'))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	o-&gt;recur-&gt;u.month_pos = (*p-'0') * (*(p+1) == '+' ? 1 : -1);</div><div class='del'>-	*str += 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-daynumber (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	int val = 0;</div><div class='del'>-	char *p = *str;</div><div class='del'>-</div><div class='del'>-	ignore_space (str);</div><div class='del'>-	if (strcmp (p, "LD")){</div><div class='del'>-		o-&gt;recur-&gt;u.month_day = DAY_LASTDAY;</div><div class='del'>-		*str += 2;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(isdigit (*p)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	while (**str &amp;&amp; isdigit (**str)){</div><div class='del'>-		val = val * 10 + (**str - '0');</div><div class='del'>-		(*str)++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (**str == '+')</div><div class='del'>-		(*str)++;</div><div class='del'>-</div><div class='del'>-	if (**str == '-')</div><div class='del'>-		val *= -1;</div><div class='del'>-	o-&gt;recur-&gt;u.month_day = val;</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'>-daynumberlist (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	int first = 0;</div><div class='del'>-	int val = 0;</div><div class='del'>-</div><div class='del'>-	ignore_space (str);</div><div class='del'>-</div><div class='del'>-	while (**str){</div><div class='del'>-		if (!isdigit (**str))</div><div class='del'>-			return;</div><div class='del'>-		while (**str &amp;&amp; isdigit (**str)){</div><div class='del'>-			val = 10 * val + (**str - '0');</div><div class='del'>-			(*str)++;</div><div class='del'>-		}</div><div class='del'>-		if (!first){</div><div class='del'>-			/*</div><div class='del'>-			 * Some broken applications set this to zero</div><div class='del'>-			 */</div><div class='del'>-			if (val == 0){</div><div class='del'>-				struct tm day = *localtime (&amp;o-&gt;dtstart);</div><div class='del'>-</div><div class='del'>-				val = day.tm_mday;</div><div class='del'>-			}</div><div class='del'>-			o-&gt;recur-&gt;u.month_day = val;</div><div class='del'>-			first = 1;</div><div class='del'>-			val = 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'>-load_recur_weekly (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	weekdaylist (o, str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_recur_monthly_pos (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	ocurrencelist (o, str);</div><div class='del'>-	weekdaynum (o, str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_recur_monthly_day (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	daynumberlist (o, str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_recur_yearly_month (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	/* Skip as we do not support multiple months and we do expect</div><div class='del'>-	 * the dtstart to agree with the value on this field</div><div class='del'>-	 */</div><div class='del'>-	skip_numbers (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_recur_yearly_day (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	/* Skip as we do not support multiple days and we do expect</div><div class='del'>-	 * the dtstart to agree with the value on this field</div><div class='del'>-	 *</div><div class='del'>-	 * FIXME: we should support every-n-years</div><div class='del'>-	 */</div><div class='del'>-	skip_numbers (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-duration (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	unsigned int duration = 0;</div><div class='del'>-</div><div class='del'>-	ignore_space (str);</div><div class='del'>-	if (**str != '#')</div><div class='del'>-		return;</div><div class='del'>-	(*str)++;</div><div class='del'>-	while (**str &amp;&amp; isdigit (**str)){</div><div class='del'>-		duration = duration * 10 + (**str - '0');</div><div class='del'>-		(*str)++;</div><div class='del'>-	}</div><div class='del'>-	o-&gt;recur-&gt;duration = duration;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-enddate (iCalObject *o, char **str)</div><div class='del'>-{</div><div class='del'>-	ignore_space (str);</div><div class='del'>-	if (isdigit (**str)){</div><div class='del'>-		o-&gt;recur-&gt;_enddate = time_from_isodate (*str);</div><div class='del'>-		*str += 16;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-load_recurrence (iCalObject *o, char *str)</div><div class='del'>-{</div><div class='del'>-	enum RecurType type;</div><div class='del'>-	int  interval = 0;</div><div class='del'>-</div><div class='del'>-	type = -1;</div><div class='del'>-	switch (*str++){</div><div class='del'>-	case 'D':</div><div class='del'>-		type = RECUR_DAILY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'W':</div><div class='del'>-		type = RECUR_WEEKLY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'M':</div><div class='del'>-		if (*str == 'P')</div><div class='del'>-			type = RECUR_MONTHLY_BY_POS;</div><div class='del'>-	        else if (*str == 'D')</div><div class='del'>-			type = RECUR_MONTHLY_BY_DAY;</div><div class='del'>-		str++;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'Y':</div><div class='del'>-		if (*str == 'M')</div><div class='del'>-			type = RECUR_YEARLY_BY_MONTH;</div><div class='del'>-		else if (*str == 'D')</div><div class='del'>-			type = RECUR_YEARLY_BY_DAY;</div><div class='del'>-		str++;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (type == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	o-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-	o-&gt;recur-&gt;type = type;</div><div class='del'>-	ignore_space (&amp;str);</div><div class='del'>-</div><div class='del'>-	/* Get the interval */</div><div class='del'>-	for (;*str &amp;&amp; isdigit (*str);str++)</div><div class='del'>-		interval = interval * 10 + (*str-'0');</div><div class='del'>-</div><div class='del'>-	if (interval == 0)</div><div class='del'>-		interval = 1;</div><div class='del'>-</div><div class='del'>-	o-&gt;recur-&gt;interval = interval;</div><div class='del'>-</div><div class='del'>-	/* this is the default per the spec */</div><div class='del'>-	o-&gt;recur-&gt;duration = 2;</div><div class='del'>-</div><div class='del'>-	ignore_space (&amp;str);</div><div class='del'>-</div><div class='del'>-	switch (type){</div><div class='del'>-	case RECUR_DAILY:</div><div class='del'>-		break;</div><div class='del'>-	case RECUR_WEEKLY:</div><div class='del'>-		load_recur_weekly (o, &amp;str);</div><div class='del'>-		break;</div><div class='del'>-	case RECUR_MONTHLY_BY_POS:</div><div class='del'>-		load_recur_monthly_pos (o, &amp;str);</div><div class='del'>-		break;</div><div class='del'>-	case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-		load_recur_monthly_day (o, &amp;str);</div><div class='del'>-		break;</div><div class='del'>-	case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-		load_recur_yearly_month (o, &amp;str);</div><div class='del'>-		break;</div><div class='del'>-	case RECUR_YEARLY_BY_DAY:</div><div class='del'>-		load_recur_yearly_day (o, &amp;str);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unimplemented recurrence type %d", (int) type);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	duration (o, &amp;str);</div><div class='del'>-	enddate (o, &amp;str);</div><div class='del'>-</div><div class='del'>-	/* Compute the enddate */</div><div class='del'>-	if (o-&gt;recur-&gt;_enddate == 0){</div><div class='del'>-		if (o-&gt;recur-&gt;duration != 0){</div><div class='del'>-			ical_object_compute_end (o);</div><div class='del'>-		} else</div><div class='del'>-			o-&gt;recur-&gt;enddate = 0;</div><div class='del'>-	} else {</div><div class='del'>-		o-&gt;recur-&gt;enddate = o-&gt;recur-&gt;_enddate;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</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 = fakeCString (vObjectUStringZValue (obj))</div><div class='del'>-#define has(obj,prop) (vo = isAPropertyOf (obj, prop))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: This is loosing precission.  Enhanec the thresholds</div><div class='del'>- */</div><div class='del'>-#define HOURS(n) (n*(60*60))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_alarm_at (iCalObject *ico, CalendarAlarm *alarm, char *iso_time, VObject *vo)</div><div class='del'>-{</div><div class='del'>-	time_t alarm_time = time_from_isodate (iso_time);</div><div class='del'>-	time_t base = ico-&gt;dtstart;</div><div class='del'>-	int d = difftime (base, alarm_time);</div><div class='del'>-	VObject *a;</div><div class='del'>-	char *the_str;</div><div class='del'>-</div><div class='del'>-	alarm-&gt;enabled = 1;</div><div class='del'>-	if (d &gt; HOURS (2)){</div><div class='del'>-		if (d &gt; HOURS (48)){</div><div class='del'>-			alarm-&gt;count = d / HOURS (24);</div><div class='del'>-			alarm-&gt;units = ALARM_DAYS;</div><div class='del'>-		} else {</div><div class='del'>-			alarm-&gt;count = d / (60*60);</div><div class='del'>-			alarm-&gt;units = ALARM_HOURS;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		alarm-&gt;count = d / 60;</div><div class='del'>-		alarm-&gt;units = ALARM_MINUTES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((a = is_a_prop_of (vo, VCSnoozeTimeProp))){</div><div class='del'>-		alarm-&gt;snooze_secs = isodiff_to_secs (str_val (a));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((a = is_a_prop_of (vo, VCRepeatCountProp))){</div><div class='del'>-		alarm-&gt;snooze_repeat = atoi (str_val (a));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Duplicates an iCalObject.  Implementation is a grand hack.</div><div class='del'>- * If you need the new ICalObject to have a new uid, free the current one,</div><div class='del'>- * and call ical_gen_uid() to generate a new one.</div><div class='del'>- */</div><div class='del'>-iCalObject *</div><div class='del'>-ical_object_duplicate (iCalObject *o)</div><div class='del'>-{</div><div class='del'>-	VObject *vo;</div><div class='del'>-	iCalObject *new;</div><div class='del'>-</div><div class='del'>-	vo = ical_object_to_vobject (o);</div><div class='del'>-	switch (o-&gt;type){</div><div class='del'>-	case ICAL_EVENT:</div><div class='del'>-		new = ical_object_create_from_vobject (vo, VCEventProp);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_TODO:</div><div class='del'>-		new = ical_object_create_from_vobject (vo, VCTodoProp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		new = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cleanVObject (vo);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: we need to load the recurrence properties */</div><div class='del'>-iCalObject *</div><div class='del'>-ical_object_create_from_vobject (VObject *o, const char *object_name)</div><div class='del'>-{</div><div class='del'>-	time_t  now = time (NULL);</div><div class='del'>-	iCalObject *ical;</div><div class='del'>-	VObject *vo, *a;</div><div class='del'>-	VObjectIterator i;</div><div class='del'>-	char *the_str;</div><div class='del'>-</div><div class='del'>-	ical = g_new0 (iCalObject, 1);</div><div class='del'>-</div><div class='del'>-	if (strcmp (object_name, VCEventProp) == 0)</div><div class='del'>-		ical-&gt;type = ICAL_EVENT;</div><div class='del'>-	else if (strcmp (object_name, VCTodoProp) == 0)</div><div class='del'>-		ical-&gt;type = ICAL_TODO;</div><div class='del'>-	else {</div><div class='del'>-		g_free (ical);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ical-&gt;ref_count = 1;</div><div class='del'>-</div><div class='del'>-	/* uid */</div><div class='del'>-	if (has (o, VCUniqueStringProp)){</div><div class='del'>-		ical-&gt;uid = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else {</div><div class='del'>-		ical-&gt;uid = ical_gen_uid ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* seq */</div><div class='del'>-	if (has (o, VCSequenceProp)){</div><div class='del'>-		ical-&gt;seq = atoi (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;seq = 0;</div><div class='del'>-</div><div class='del'>-	/* dtstart */</div><div class='del'>-	if (has (o, VCDTstartProp)){</div><div class='del'>-		ical-&gt;dtstart = time_from_isodate (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;dtstart = 0;</div><div class='del'>-</div><div class='del'>-	/* dtend */</div><div class='del'>-	ical-&gt;dtend = 0;	/* default value */</div><div class='del'>-	if (ical-&gt;type == ICAL_EVENT){</div><div class='del'>-		if (has (o, VCDTendProp)){</div><div class='del'>-			ical-&gt;dtend = time_from_isodate (str_val (vo));</div><div class='del'>-			free (the_str);</div><div class='del'>-		}</div><div class='del'>-	} else if (ical-&gt;type == ICAL_TODO){</div><div class='del'>-		if (has (o, VCDueProp)){</div><div class='del'>-			ical-&gt;dtend = time_from_isodate (str_val (vo));</div><div class='del'>-			free (the_str);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* dcreated */</div><div class='del'>-	if (has (o, VCDCreatedProp)){</div><div class='del'>-		ical-&gt;created = time_from_isodate (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* completed */</div><div class='del'>-	if (has (o, VCCompletedProp)){</div><div class='del'>-		ical-&gt;completed = time_from_isodate (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* last_mod */</div><div class='del'>-	if (has (o, VCLastModifiedProp)){</div><div class='del'>-		ical-&gt;last_mod = time_from_isodate (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;last_mod = now;</div><div class='del'>-</div><div class='del'>-	/* exdate */</div><div class='del'>-	if (has (o, VCExpDateProp)){</div><div class='del'>-		ical-&gt;exdate = set_date_list (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* description/comment */</div><div class='del'>-	if (has (o, VCDescriptionProp)){</div><div class='del'>-		ical-&gt;comment = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* summary */</div><div class='del'>-	if (has (o, VCSummaryProp)){</div><div class='del'>-		ical-&gt;summary = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-</div><div class='del'>-		/* Convert any CR/LF/CRLF sequences in the summary field to</div><div class='del'>-		   spaces so we just have a one-line field. */</div><div class='del'>-		ical_object_normalize_summary (ical);</div><div class='del'>-	} else </div><div class='del'>-		ical-&gt;summary = g_strdup ("");</div><div class='del'>-</div><div class='del'>-	/* status */</div><div class='del'>-	if (has (o, VCStatusProp)){</div><div class='del'>-		ical-&gt;status = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;status = g_strdup ("NEEDS ACTION");</div><div class='del'>-</div><div class='del'>-	if (has (o, VCClassProp)){</div><div class='del'>-		ical-&gt;class = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;class = g_strdup ("PUBLIC");</div><div class='del'>-</div><div class='del'>-	/* categories */</div><div class='del'>-	if (has (o, VCCategoriesProp)){</div><div class='del'>-		ical-&gt;categories = set_list (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* resources */</div><div class='del'>-	if (has (o, VCResourcesProp)){</div><div class='del'>-		ical-&gt;resources = set_list (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* priority */</div><div class='del'>-	if (has (o, VCPriorityProp)){</div><div class='del'>-		ical-&gt;priority = atoi (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* tranparency */</div><div class='del'>-	if (has (o, VCTranspProp)){</div><div class='del'>-		ical-&gt;transp = atoi (str_val (vo)) ? ICAL_TRANSPARENT : ICAL_OPAQUE;</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Organizer */</div><div class='del'>-	if (has (o, VCOrgNameProp)){</div><div class='del'>-		ical-&gt;organizer = g_new0 (iCalPerson, 1);</div><div class='del'>-		ical-&gt;organizer-&gt;addr = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* related */</div><div class='del'>-	if (has (o, VCRelatedToProp)){</div><div class='del'>-		char *str;</div><div class='del'>-		char *s;</div><div class='del'>-		iCalRelation *rel;</div><div class='del'>-		str = str_val (vo);</div><div class='del'>-		for (s = strtok (str, ";"); s; s = strtok (NULL, ";")) {</div><div class='del'>-			rel = g_new0 (iCalRelation, 1);</div><div class='del'>-			rel-&gt;uid = g_strdup (s);</div><div class='del'>-			rel-&gt;reltype = g_strdup ("PARENT");</div><div class='del'>-			ical-&gt;related = g_list_prepend (ical-&gt;related, rel);</div><div class='del'>-		}</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* attach */</div><div class='del'>-	initPropIterator (&amp;i, o);</div><div class='del'>-	while (moreIteration (&amp;i)){</div><div class='del'>-		vo = nextVObject (&amp;i);</div><div class='del'>-		if (strcmp (vObjectName (vo), VCAttachProp) == 0){</div><div class='del'>-			ical-&gt;attach = g_list_prepend (ical-&gt;attach, g_strdup (str_val (vo)));</div><div class='del'>-			free (the_str);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* url */</div><div class='del'>-	if (has (o, VCURLProp)){</div><div class='del'>-		ical-&gt;url = g_strdup (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* dalarm */</div><div class='del'>-	ical-&gt;dalarm.type = ALARM_DISPLAY;</div><div class='del'>-	ical-&gt;dalarm.enabled = 0;</div><div class='del'>-	if (has (o, VCDAlarmProp)){</div><div class='del'>-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){</div><div class='del'>-			setup_alarm_at (ical, &amp;ical-&gt;dalarm, str_val (a), vo);</div><div class='del'>-			free (the_str);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* aalarm */</div><div class='del'>-	ical-&gt;aalarm.type = ALARM_AUDIO;</div><div class='del'>-	ical-&gt;aalarm.enabled = 0;</div><div class='del'>-	if (has (o, VCAAlarmProp)){</div><div class='del'>-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){</div><div class='del'>-			setup_alarm_at (ical, &amp;ical-&gt;aalarm, str_val (a), vo);</div><div class='del'>-			free (the_str);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* palarm */</div><div class='del'>-	ical-&gt;palarm.type = ALARM_PROGRAM;</div><div class='del'>-	ical-&gt;palarm.enabled = 0;</div><div class='del'>-	if (has (o, VCPAlarmProp)){</div><div class='del'>-		ical-&gt;palarm.type = ALARM_PROGRAM;</div><div class='del'>-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){</div><div class='del'>-			setup_alarm_at (ical, &amp;ical-&gt;palarm, str_val (a), vo);</div><div class='del'>-			free (the_str);</div><div class='del'>-</div><div class='del'>-			if ((a = is_a_prop_of (vo, VCProcedureNameProp))){</div><div class='del'>-				ical-&gt;palarm.data = g_strdup (str_val (a));</div><div class='del'>-				free (the_str);</div><div class='del'>-			} else</div><div class='del'>-				ical-&gt;palarm.data = g_strdup ("");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* malarm */</div><div class='del'>-	ical-&gt;malarm.type = ALARM_MAIL;</div><div class='del'>-	ical-&gt;malarm.enabled = 0;</div><div class='del'>-	if (has (o, VCMAlarmProp)){</div><div class='del'>-		ical-&gt;malarm.type = ALARM_MAIL;</div><div class='del'>-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){</div><div class='del'>-			setup_alarm_at (ical, &amp;ical-&gt;malarm, str_val (a), vo);</div><div class='del'>-			free (the_str);</div><div class='del'>-</div><div class='del'>-			if ((a = is_a_prop_of (vo, VCEmailAddressProp))){</div><div class='del'>-				ical-&gt;malarm.data = g_strdup (str_val (a));</div><div class='del'>-				free (the_str);</div><div class='del'>-			} else</div><div class='del'>-				ical-&gt;malarm.data = g_strdup ("");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* rrule */</div><div class='del'>-	if (has (o, VCRRuleProp)){</div><div class='del'>-		if (!load_recurrence (ical, str_val (vo))) {</div><div class='del'>-			ical_object_unref (ical);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		free (the_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Pilot</div><div class='del'>-	 */</div><div class='del'>-	if (has (o, XPilotIdProp)){</div><div class='del'>-		ical-&gt;pilot_id = atoi (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;pilot_id = 0;</div><div class='del'>-</div><div class='del'>-	if (has (o, XPilotStatusProp)){</div><div class='del'>-		ical-&gt;pilot_status = atoi (str_val (vo));</div><div class='del'>-		free (the_str);</div><div class='del'>-	} else</div><div class='del'>-		ical-&gt;pilot_status = ICAL_PILOT_SYNC_MOD;</div><div class='del'>-</div><div class='del'>-	return ical;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-to_str (int num)</div><div class='del'>-{</div><div class='del'>-	static char buf [40];</div><div class='del'>-</div><div class='del'>-	sprintf (buf, "%d", num);</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * stores a GList in the property.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-store_list (VObject *o, char *prop, GList *values)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int len;</div><div class='del'>-	char *result, *p;</div><div class='del'>-</div><div class='del'>-	for (len = 0, l = values; l; l = l-&gt;next)</div><div class='del'>-		len += strlen (l-&gt;data) + 1;</div><div class='del'>-</div><div class='del'>-	result = g_malloc (len);</div><div class='del'>-</div><div class='del'>-	for (p = result, l = values; l; l = l-&gt;next) {</div><div class='del'>-		int len = strlen (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		strcpy (p, l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (l-&gt;next) {</div><div class='del'>-			p [len] = ';';</div><div class='del'>-			p += len+1;</div><div class='del'>-		} else</div><div class='del'>-			p += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*p = 0;</div><div class='del'>-</div><div class='del'>-	addPropValue (o, prop, result);</div><div class='del'>-	g_free (result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-store_rel_list (VObject *o, char *prop, GList *values)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int len;</div><div class='del'>-	char *result, *p;</div><div class='del'>-	</div><div class='del'>-	for (len = 0, l = values; l; l = l-&gt;next)</div><div class='del'>-		len += strlen (((iCalRelation*)(l-&gt;data))-&gt;uid) + 1;</div><div class='del'>-</div><div class='del'>-	result = g_malloc (len);</div><div class='del'>-</div><div class='del'>-	for (p = result, l = values; l; l = l-&gt;next) {</div><div class='del'>-		int len = strlen (((iCalRelation*)(l-&gt;data))-&gt;uid);</div><div class='del'>-		</div><div class='del'>-		strcpy (p, ((iCalRelation*)(l-&gt;data))-&gt;uid);</div><div class='del'>-</div><div class='del'>-		if (l-&gt;next) {</div><div class='del'>-			p [len] = ';';</div><div class='del'>-			p += len+1;</div><div class='del'>-		} else</div><div class='del'>-			p += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*p = 0;</div><div class='del'>-</div><div class='del'>-	addPropValue (o, prop, result);</div><div class='del'>-	g_free (result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-store_date_list (VObject *o, char *prop, GList *values)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int   size, len;</div><div class='del'>-	char  *s, *p;</div><div class='del'>-</div><div class='del'>-	size = g_list_length (values);</div><div class='del'>-	s = p = g_malloc ((size * 17 + 1) * sizeof (char));</div><div class='del'>-</div><div class='del'>-	for (l = values; l; l = l-&gt;next){</div><div class='del'>-		strcpy (s, isodate_from_time_t (*(time_t *)l-&gt;data));</div><div class='del'>-		len = strlen (s);</div><div class='del'>-		s [len] = ',';</div><div class='del'>-		s += len + 1;</div><div class='del'>-	}</div><div class='del'>-	s--;</div><div class='del'>-	*s = 0;</div><div class='del'>-	addPropValue (o, prop, p);</div><div class='del'>-	g_free (p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *recur_type_name [] = { "D", "W", "MP", "MD", "YM", "YD" };</div><div class='del'>-static char *recur_day_list  [] = { "SU", "MO", "TU","WE", "TH", "FR", "SA" };</div><div class='del'>-static char *alarm_names [] = { VCMAlarmProp, VCPAlarmProp, VCDAlarmProp, VCAAlarmProp };</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-save_alarm (VObject *o, CalendarAlarm *alarm, iCalObject *ical)</div><div class='del'>-{</div><div class='del'>-	VObject *alarm_object;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t alarm_time;</div><div class='del'>-</div><div class='del'>-	if (!alarm-&gt;enabled)</div><div class='del'>-		return NULL;</div><div class='del'>-	tm = *localtime (&amp;ical-&gt;dtstart);</div><div class='del'>-	switch (alarm-&gt;units){</div><div class='del'>-	case ALARM_MINUTES:</div><div class='del'>-		tm.tm_min -= alarm-&gt;count;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_HOURS:</div><div class='del'>-		tm.tm_hour -= alarm-&gt;count;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_DAYS:</div><div class='del'>-		tm.tm_mday -= alarm-&gt;count;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alarm_time = mktime (&amp;tm);</div><div class='del'>-	alarm_object = addProp (o, alarm_names [alarm-&gt;type]);</div><div class='del'>-	addPropValue (alarm_object, VCRunTimeProp, isodate_from_time_t (alarm_time));</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;snooze_secs)</div><div class='del'>-		addPropValue (alarm_object, VCSnoozeTimeProp, isodiff_from_secs (alarm-&gt;snooze_secs));</div><div class='del'>-	else</div><div class='del'>-		addPropValue (alarm_object, VCSnoozeTimeProp, "");</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;snooze_repeat){</div><div class='del'>-		char buf [20];</div><div class='del'>-</div><div class='del'>-		sprintf (buf, "%d", alarm-&gt;snooze_repeat);</div><div class='del'>-		addPropValue (alarm_object, VCRepeatCountProp, buf);</div><div class='del'>-	} else</div><div class='del'>-		addPropValue (alarm_object, VCRepeatCountProp, "");</div><div class='del'>-	return alarm_object;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-VObject *</div><div class='del'>-ical_object_to_vobject (iCalObject *ical)</div><div class='del'>-{</div><div class='del'>-	VObject *o, *alarm, *s;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	if (ical-&gt;type == ICAL_EVENT)</div><div class='del'>-		o = newVObject (VCEventProp);</div><div class='del'>-	else</div><div class='del'>-		o = newVObject (VCTodoProp);</div><div class='del'>-</div><div class='del'>-	/* uid */</div><div class='del'>-	if (ical-&gt;uid)</div><div class='del'>-		addPropValue (o, VCUniqueStringProp, ical-&gt;uid);</div><div class='del'>-</div><div class='del'>-	/* seq */</div><div class='del'>-	addPropValue (o, VCSequenceProp, to_str (ical-&gt;seq));</div><div class='del'>-</div><div class='del'>-	/* dtstart */</div><div class='del'>-	addPropValue (o, VCDTstartProp, isodate_from_time_t (ical-&gt;dtstart));</div><div class='del'>-</div><div class='del'>-	/* dtend */</div><div class='del'>-	if (ical-&gt;type == ICAL_EVENT){</div><div class='del'>-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical-&gt;dtend));</div><div class='del'>-	} else if (ical-&gt;type == ICAL_TODO){</div><div class='del'>-		addPropValue (o, VCDueProp, isodate_from_time_t (ical-&gt;dtend));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* dcreated */</div><div class='del'>-	addPropValue (o, VCDCreatedProp, isodate_from_time_t (ical-&gt;created));</div><div class='del'>-</div><div class='del'>-	/* completed */</div><div class='del'>-	if (ical-&gt;completed)</div><div class='del'>-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical-&gt;completed));</div><div class='del'>-</div><div class='del'>-	/* last_mod */</div><div class='del'>-	addPropValue (o, VCLastModifiedProp, isodate_from_time_t (ical-&gt;last_mod));</div><div class='del'>-</div><div class='del'>-	/* exdate */</div><div class='del'>-	if (ical-&gt;exdate)</div><div class='del'>-		store_date_list (o, VCExpDateProp, ical-&gt;exdate);</div><div class='del'>-</div><div class='del'>-	/* description/comment */</div><div class='del'>-	if (ical-&gt;comment &amp;&amp; strlen (ical-&gt;comment)){</div><div class='del'>-		s = addPropValue (o, VCDescriptionProp, ical-&gt;comment);</div><div class='del'>-		if (strchr (ical-&gt;comment, '\n'))</div><div class='del'>-			addProp (s, VCQuotedPrintableProp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* summary */</div><div class='del'>-	if (ical-&gt;summary &amp;&amp; strlen (ical-&gt;summary)) {</div><div class='del'>-		s = addPropValue (o, VCSummaryProp, ical-&gt;summary);</div><div class='del'>-		if (strchr (ical-&gt;summary, '\n'))</div><div class='del'>-			addProp (s, VCQuotedPrintableProp);</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	/* status */</div><div class='del'>-	addPropValue (o, VCStatusProp, ical-&gt;status);</div><div class='del'>-</div><div class='del'>-	/* class */</div><div class='del'>-	addPropValue (o, VCClassProp, ical-&gt;class);</div><div class='del'>-</div><div class='del'>-	/* categories */</div><div class='del'>-	if (ical-&gt;categories)</div><div class='del'>-		store_list (o, VCCategoriesProp, ical-&gt;categories);</div><div class='del'>-</div><div class='del'>-	/* resources */</div><div class='del'>-	if (ical-&gt;resources)</div><div class='del'>-		store_list (o, VCCategoriesProp, ical-&gt;resources);</div><div class='del'>-</div><div class='del'>-	/* priority */</div><div class='del'>-	addPropValue (o, VCPriorityProp, to_str (ical-&gt;priority));</div><div class='del'>-</div><div class='del'>-	/* transparency */</div><div class='del'>-	addPropValue (o, VCTranspProp, to_str (ical-&gt;transp));</div><div class='del'>-</div><div class='del'>-	/* Owner/organizer */</div><div class='del'>-	if (ical-&gt;organizer &amp;&amp; ical-&gt;organizer-&gt;addr)</div><div class='del'>-		addPropValue (o, VCOrgNameProp, ical-&gt;organizer-&gt;addr);</div><div class='del'>-</div><div class='del'>-	/* related */</div><div class='del'>-	if (ical-&gt;related)</div><div class='del'>-		store_rel_list (o, VCRelatedToProp, ical-&gt;related);</div><div class='del'>-</div><div class='del'>-	/* attach */</div><div class='del'>-	for (l = ical-&gt;attach; l; l = l-&gt;next)</div><div class='del'>-		addPropValue (o, VCAttachProp, l-&gt;data);</div><div class='del'>-</div><div class='del'>-	/* url */</div><div class='del'>-	if (ical-&gt;url)</div><div class='del'>-		addPropValue (o, VCURLProp, ical-&gt;url);</div><div class='del'>-</div><div class='del'>-	if (ical-&gt;recur){</div><div class='del'>-		char result [256];</div><div class='del'>-		char buffer [80];</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		sprintf (result, "%s%d ", recur_type_name [ical-&gt;recur-&gt;type], ical-&gt;recur-&gt;interval);</div><div class='del'>-		switch (ical-&gt;recur-&gt;type){</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			for (i = 0; i &lt; 7; i++){</div><div class='del'>-				if (ical-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; i)){</div><div class='del'>-					sprintf (buffer, "%s ", recur_day_list [i]);</div><div class='del'>-					strcat (result, buffer);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_MONTHLY_BY_POS: {</div><div class='del'>-			int nega = ical-&gt;recur-&gt;u.month_pos &lt; 0;</div><div class='del'>-</div><div class='del'>-			sprintf (buffer, "%d%s ", nega ? -ical-&gt;recur-&gt;u.month_pos : ical-&gt;recur-&gt;u.month_pos,</div><div class='del'>-				 nega ? "-" : "+");</div><div class='del'>-			strcat (result, buffer);</div><div class='del'>-			/* the gui is set up for a single day, not a set here in this case */</div><div class='del'>-			sprintf (buffer, "%s ", recur_day_list [ical-&gt;recur-&gt;weekday]);</div><div class='del'>-			strcat (result, buffer);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			sprintf (buffer, "%d ", ical-&gt;recur-&gt;u.month_pos);</div><div class='del'>-			strcat (result, buffer);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (ical-&gt;recur-&gt;_enddate == 0)</div><div class='del'>-			sprintf (buffer, "#%d ",ical-&gt;recur-&gt;duration);</div><div class='del'>-		else</div><div class='del'>-			sprintf (buffer, "%s ", isodate_from_time_t (ical-&gt;recur-&gt;_enddate));</div><div class='del'>-		strcat (result, buffer);</div><div class='del'>-		addPropValue (o, VCRRuleProp, result);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	save_alarm (o, &amp;ical-&gt;aalarm, ical);</div><div class='del'>-	save_alarm (o, &amp;ical-&gt;dalarm, ical);</div><div class='del'>-</div><div class='del'>-	if ((alarm = save_alarm (o, &amp;ical-&gt;palarm, ical)))</div><div class='del'>-		addPropValue (alarm, VCProcedureNameProp, ical-&gt;palarm.data);</div><div class='del'>-	if ((alarm = save_alarm (o, &amp;ical-&gt;malarm, ical)))</div><div class='del'>-		addPropValue (alarm, VCEmailAddressProp, ical-&gt;malarm.data);</div><div class='del'>-</div><div class='del'>-	/* Pilot */</div><div class='del'>-	{</div><div class='del'>-		char buffer [20];</div><div class='del'>-</div><div class='del'>-		sprintf (buffer, "%d", ical-&gt;pilot_id);</div><div class='del'>-		addPropValue (o, XPilotIdProp, buffer);</div><div class='del'>-		sprintf (buffer, "%d", ical-&gt;pilot_status);</div><div class='del'>-		addPropValue (o, XPilotStatusProp, buffer);</div><div class='del'>-	}</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'>-ical_foreach (GList *events, calendarfn fn, void *closure)</div><div class='del'>-{</div><div class='del'>-	for (; events; events = events-&gt;next){</div><div class='del'>-		iCalObject *ical = events-&gt;data;</div><div class='del'>-</div><div class='del'>-		(*fn) (ical, ical-&gt;dtstart, ical-&gt;dtend, closure);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-is_date_in_list (GList *list, struct tm *date)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	for (; list; list = list-&gt;next){</div><div class='del'>-		time_t *timep = list-&gt;data;</div><div class='del'>-</div><div class='del'>-		tm = *localtime (timep);</div><div class='del'>-		if (date-&gt;tm_mday == tm.tm_mday &amp;&amp;</div><div class='del'>-		    date-&gt;tm_mon  == tm.tm_mon &amp;&amp;</div><div class='del'>-		    date-&gt;tm_year == tm.tm_year){</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'>-/* Generates an event instance based on the reference time */</div><div class='del'>-static gboolean</div><div class='del'>-generate (iCalObject *ico, time_t reference, calendarfn cb, void *closure)</div><div class='del'>-{</div><div class='del'>-	time_t offset;</div><div class='del'>-	struct tm tm_start, ref;</div><div class='del'>-	time_t start, end;</div><div class='del'>-</div><div class='del'>-	offset = ico-&gt;dtend - ico-&gt;dtstart;</div><div class='del'>-</div><div class='del'>-	tm_start = *localtime (&amp;ico-&gt;dtstart);</div><div class='del'>-	ref      = *localtime (&amp;reference);</div><div class='del'>-</div><div class='del'>-	tm_start.tm_mday = ref.tm_mday;</div><div class='del'>-	tm_start.tm_mon  = ref.tm_mon;</div><div class='del'>-	tm_start.tm_year = ref.tm_year;</div><div class='del'>-</div><div class='del'>-	start = mktime (&amp;tm_start);</div><div class='del'>-	if (start == -1) {</div><div class='del'>-		g_message ("generate(): Produced invalid start date!");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	end = start + offset;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* FIXME: I think this is not needed, since we are offsetting by full day values,</div><div class='del'>-	 * and the times should remain the same --- if you have a daily appointment</div><div class='del'>-	 * at 18:00, it is always at 18:00 even during daylight savings.</div><div class='del'>-	 *</div><div class='del'>-	 * However, what should happen on the exact change-of-savings day with</div><div class='del'>-	 * appointments in the early morning hours?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ref.tm_isdst &gt; tm_start.tm_isdst) {</div><div class='del'>-		tm_start.tm_hour--;</div><div class='del'>-		tm_end.tm_hour--;</div><div class='del'>-	} else if (ref.tm_isdst &lt; tm_start.tm_isdst) {</div><div class='del'>-		tm_start.tm_hour++;</div><div class='del'>-		tm_end.tm_hour++;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;exdate &amp;&amp; is_date_in_list (ico-&gt;exdate, &amp;tm_start))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return (*cb) (ico, start, end, closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-ical_object_get_first_weekday (int weekday_mask)</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'>-		if (weekday_mask &amp; (1 &lt;&lt; i))</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'>-#define time_in_range(t, a, b) ((t &gt;= a) &amp;&amp; (b ? (t &lt; b) : 1))</div><div class='del'>-#define recur_in_range(t, r) (r-&gt;enddate ? (t &lt; r-&gt;enddate) : 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generate every possible event.  Invokes the callback routine for</div><div class='del'>- * every occurrence of the event in the [START, END] time interval.</div><div class='del'>- *</div><div class='del'>- * If END is zero, the event is generated forever.</div><div class='del'>- * The callback routine is expected to return 0 when no further event</div><div class='del'>- * generation is requested.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-ical_object_generate_events (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure)</div><div class='del'>-{</div><div class='del'>-	time_t current;</div><div class='del'>-	int first_week_day;</div><div class='del'>-</div><div class='del'>-	/* If there is no recurrence, just check ranges */</div><div class='del'>-</div><div class='del'>-	if (!ico-&gt;recur) {</div><div class='del'>-		if ((end &amp;&amp; (ico-&gt;dtstart &lt; end) &amp;&amp; (ico-&gt;dtend &gt; start))</div><div class='del'>-		    || ((end == 0) &amp;&amp; (ico-&gt;dtend &gt; start))) {</div><div class='del'>-			/* The new calendar views expect the times to not be</div><div class='del'>-			   clipped, so they can show that it continues past</div><div class='del'>-			   the end of the viewable area. */</div><div class='del'>-#if 0</div><div class='del'>-			time_t ev_s, ev_e;</div><div class='del'>-</div><div class='del'>-			/* Clip range */</div><div class='del'>-</div><div class='del'>-			ev_s = MAX (ico-&gt;dtstart, start);</div><div class='del'>-			ev_e = MIN (ico-&gt;dtend, end);</div><div class='del'>-</div><div class='del'>-			(* cb) (ico, ev_s, ev_e, closure);</div><div class='del'>-#else</div><div class='del'>-			(* cb) (ico, ico-&gt;dtstart, ico-&gt;dtend, closure);</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The event has a recurrence rule -- check that we will generate at least one instance */</div><div class='del'>-</div><div class='del'>-	if (end != 0) {</div><div class='del'>-		if (ico-&gt;dtstart &gt; end)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		if (!IS_INFINITE (ico-&gt;recur) &amp;&amp; (ico-&gt;recur-&gt;enddate &lt; start))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Generate the instances */</div><div class='del'>-</div><div class='del'>-	current = ico-&gt;dtstart;</div><div class='del'>-</div><div class='del'>-	switch (ico-&gt;recur-&gt;type) {</div><div class='del'>-	case RECUR_DAILY:</div><div class='del'>-		do {</div><div class='del'>-			if (time_in_range (current, start, end) &amp;&amp; recur_in_range (current, ico-&gt;recur))</div><div class='del'>-				if (!generate (ico, current, cb, closure))</div><div class='del'>-					return;</div><div class='del'>-</div><div class='del'>-			/* Advance */</div><div class='del'>-</div><div class='del'>-			current = time_add_day (current, ico-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-			if (current == -1) {</div><div class='del'>-				g_warning ("RECUR_DAILY: time_add_day() returned invalid time");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while ((current &lt; end) || (end == 0));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_WEEKLY:</div><div class='del'>-		do {</div><div class='del'>-			struct tm tm;</div><div class='del'>-</div><div class='del'>-			tm = *localtime (&amp;current);</div><div class='del'>-</div><div class='del'>-			if (time_in_range (current, start, end) &amp;&amp; recur_in_range (current, ico-&gt;recur)) {</div><div class='del'>-				/* Weekdays to recur on are specified as a bitmask */</div><div class='del'>-			  if (ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; tm.tm_wday)) {</div><div class='del'>-					if (!generate (ico, current, cb, closure))</div><div class='del'>-						return;</div><div class='del'>-			  }</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Advance by day for scanning the week or by interval at week end */</div><div class='del'>-</div><div class='del'>-			if (tm.tm_wday == 6)</div><div class='del'>-				current = time_add_day (current, (ico-&gt;recur-&gt;interval - 1) * 7 + 1);</div><div class='del'>-			else</div><div class='del'>-				current = time_add_day (current, 1);</div><div class='del'>-</div><div class='del'>-			if (current == -1) {</div><div class='del'>-				g_warning ("RECUR_WEEKLY: time_add_day() returned invalid time\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while (current &lt; end || (end == 0));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_MONTHLY_BY_POS:</div><div class='del'>-		/* FIXME: We only deal with positives now */</div><div class='del'>-		if (ico-&gt;recur-&gt;u.month_pos &lt; 0) {</div><div class='del'>-			g_warning ("RECUR_MONTHLY_BY_POS does not support negative positions yet");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ico-&gt;recur-&gt;u.month_pos == 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		first_week_day = /* ical_object_get_first_weekday (ico-&gt;recur-&gt;weekday);  */</div><div class='del'>-			ico-&gt;recur-&gt;weekday; /* the i/f only lets you choose a single day of the week! */</div><div class='del'>-</div><div class='del'>-		/* This should not happen, but take it into account */</div><div class='del'>-		if (first_week_day == -1) {</div><div class='del'>-			g_warning ("ical_object_get_first_weekday() returned -1");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			struct tm tm;</div><div class='del'>-			time_t t;</div><div class='del'>-			int    week_day_start;</div><div class='del'>-</div><div class='del'>-			tm = *localtime (&amp;current);</div><div class='del'>-			tm.tm_mday = 1;</div><div class='del'>-			t = mktime (&amp;tm);</div><div class='del'>-			tm = *localtime (&amp;t);</div><div class='del'>-			week_day_start = tm.tm_wday;</div><div class='del'>-</div><div class='del'>-			tm.tm_mday = (7 * (ico-&gt;recur-&gt;u.month_pos - ((week_day_start &lt;= first_week_day ) ? 1 : 0))</div><div class='del'>-				      - (week_day_start - first_week_day) + 1);</div><div class='del'>-			if( tm.tm_mday &gt; 31 )</div><div class='del'>-			{</div><div class='del'>-				tm.tm_mday = 1;</div><div class='del'>-				tm.tm_mon += ico-&gt;recur-&gt;interval;</div><div class='del'>-				current = mktime (&amp;tm);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			switch( tm.tm_mon )</div><div class='del'>-			{</div><div class='del'>-			case 3:</div><div class='del'>-			case 5:</div><div class='del'>-			case 8:</div><div class='del'>-			case 10:</div><div class='del'>-				if( tm.tm_mday &gt; 30 )</div><div class='del'>-				{</div><div class='del'>-					tm.tm_mday = 1;</div><div class='del'>-					tm.tm_mon += ico-&gt;recur-&gt;interval;</div><div class='del'>-					current = mktime (&amp;tm);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				if( ((tm.tm_year+1900)%4) == 0</div><div class='del'>-					&amp;&amp; ((tm.tm_year+1900)%400) != 100</div><div class='del'>-					&amp;&amp; ((tm.tm_year+1900)%400) != 200</div><div class='del'>-					&amp;&amp; ((tm.tm_year+1900)%400) != 300 )</div><div class='del'>-				{</div><div class='del'>-</div><div class='del'>-					if( tm.tm_mday &gt; 29 )</div><div class='del'>-					{</div><div class='del'>-						tm.tm_mday = 1;</div><div class='del'>-						tm.tm_mon += ico-&gt;recur-&gt;interval;</div><div class='del'>-						current = mktime (&amp;tm);</div><div class='del'>-						continue;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					if( tm.tm_mday &gt; 28 )</div><div class='del'>-					{</div><div class='del'>-						tm.tm_mday = 1;</div><div class='del'>-						tm.tm_mon += ico-&gt;recur-&gt;interval;</div><div class='del'>-						current = mktime (&amp;tm);</div><div class='del'>-						continue;</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'>-			t = mktime (&amp;tm);</div><div class='del'>-</div><div class='del'>-			if (time_in_range (t, start, end) &amp;&amp; recur_in_range (current, ico-&gt;recur))</div><div class='del'>-				if (!generate (ico, t, cb, closure))</div><div class='del'>-					return;</div><div class='del'>-</div><div class='del'>-			/* Advance by the appropriate number of months */</div><div class='del'>-</div><div class='del'>-			current = mktime (&amp;tm);</div><div class='del'>-</div><div class='del'>-			tm.tm_mday = 1;</div><div class='del'>-			tm.tm_mon += ico-&gt;recur-&gt;interval;</div><div class='del'>-			current = mktime (&amp;tm);</div><div class='del'>-</div><div class='del'>-			if (current == -1) {</div><div class='del'>-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while ((current &lt; end) || (end == 0));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-		do {</div><div class='del'>-			struct tm tm;</div><div class='del'>-			time_t t;</div><div class='del'>-			int    p;</div><div class='del'>-</div><div class='del'>-			tm = *localtime (&amp;current);</div><div class='del'>-</div><div class='del'>-			p = tm.tm_mday;</div><div class='del'>-			tm.tm_mday = ico-&gt;recur-&gt;u.month_day;</div><div class='del'>-			t = mktime (&amp;tm);</div><div class='del'>-			if (time_in_range (t, start, end) &amp;&amp; recur_in_range (current, ico-&gt;recur))</div><div class='del'>-				if (!generate (ico, t, cb, closure))</div><div class='del'>-					return;</div><div class='del'>-</div><div class='del'>-			/* Advance by the appropriate number of months */</div><div class='del'>-</div><div class='del'>-			tm.tm_mday = p;</div><div class='del'>-			tm.tm_mon += ico-&gt;recur-&gt;interval;</div><div class='del'>-			current = mktime (&amp;tm);</div><div class='del'>-</div><div class='del'>-			if (current == -1) {</div><div class='del'>-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while (current &lt; end || (end == 0));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-	case RECUR_YEARLY_BY_DAY:</div><div class='del'>-		do {</div><div class='del'>-			if (time_in_range (current, start, end) &amp;&amp; recur_in_range (current, ico-&gt;recur))</div><div class='del'>-				if (!generate (ico, current, cb, closure))</div><div class='del'>-					return;</div><div class='del'>-</div><div class='del'>-			/* Advance */</div><div class='del'>-</div><div class='del'>-			current = time_add_year (current, ico-&gt;recur-&gt;interval);</div><div class='del'>-		} while (current &lt; end || (end == 0));</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'>-static int</div><div class='del'>-duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)</div><div class='del'>-{</div><div class='del'>-	int *count = closure;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;start);</div><div class='del'>-</div><div class='del'>-	(*count)++;</div><div class='del'>-	if (ico-&gt;recur-&gt;duration == *count) {</div><div class='del'>-		ico-&gt;recur-&gt;enddate = time_day_end (end);</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'>-/* Computes ico-&gt;recur-&gt;enddate from ico-&gt;recur-&gt;duration */</div><div class='del'>-void</div><div class='del'>-ical_object_compute_end (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ico-&gt;recur != NULL);</div><div class='del'>-</div><div class='del'>-	ico-&gt;recur-&gt;_enddate = 0;</div><div class='del'>-	ico-&gt;recur-&gt;enddate = 0;</div><div class='del'>-	ical_object_generate_events (ico, ico-&gt;dtstart, 0, duration_callback, &amp;count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-alarm_compute_offset (CalendarAlarm *a)</div><div class='del'>-{</div><div class='del'>-	if (!a-&gt;enabled)</div><div class='del'>-		return -1;</div><div class='del'>-	switch (a-&gt;units){</div><div class='del'>-	case ALARM_MINUTES:</div><div class='del'>-		a-&gt;offset = a-&gt;count * 60;</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_HOURS:</div><div class='del'>-		a-&gt;offset = a-&gt;count * 3600;</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_DAYS:</div><div class='del'>-		a-&gt;offset = a-&gt;count * 24 * 3600;</div><div class='del'>-	}</div><div class='del'>-	return a-&gt;offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ical_object_find_in_string:</div><div class='del'>- * @uid: Unique identifier of the sought object.</div><div class='del'>- * @vcalobj: String representation of a complete calendar object.</div><div class='del'>- * @ico: The resulting #iCalObject is stored here.</div><div class='del'>- *</div><div class='del'>- * Parses a complete vCalendar object string and tries to find the calendar</div><div class='del'>- * object that matches the specified @uid.  If found, it stores the resulting</div><div class='del'>- * #iCalObject in the @ico parameter.</div><div class='del'>- *</div><div class='del'>- * Return value: A result code depending on whether the parse and search were</div><div class='del'>- * successful.</div><div class='del'>- **/</div><div class='del'>-CalObjFindStatus</div><div class='del'>-ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	icalcomponent* comp = NULL;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-	iCalObject    *ical;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	comp = icalparser_parse_string (vcalobj);</div><div class='del'>-</div><div class='del'>-	if (!comp) {</div><div class='del'>-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #1\n");</div><div class='del'>-		return CAL_OBJ_FIND_SYNTAX_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	subcomp = icalcomponent_get_first_component (comp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	if (!subcomp) {</div><div class='del'>-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #2\n");</div><div class='del'>-		return CAL_OBJ_FIND_SYNTAX_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		ical = ical_object_create_from_icalcomponent (subcomp);</div><div class='del'>-		if (ical-&gt;type != ICAL_EVENT &amp;&amp; </div><div class='del'>-		    ical-&gt;type != ICAL_TODO  &amp;&amp;</div><div class='del'>-		    ical-&gt;type != ICAL_JOURNAL) {</div><div class='del'>-			g_warning ("Skipping unsupported iCalendar component");</div><div class='del'>-		} else {</div><div class='del'>-			if (strcasecmp (ical-&gt;uid, uid) == 0) {</div><div class='del'>-				(*ico) = ical;</div><div class='del'>-				(*ico)-&gt;ref_count = 1;</div><div class='del'>-				printf ("CAL_OBJ_FIND_SUCCESS\n");</div><div class='del'>-</div><div class='del'>-	printf ("ical_object_find_in_string:\n");</div><div class='del'>-	printf ("-----------------------------------------------------\n");</div><div class='del'>-	dump_icalobject (*ico);</div><div class='del'>-	printf ("-----------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-				return CAL_OBJ_FIND_SUCCESS;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		subcomp = icalcomponent_get_next_component (comp,</div><div class='del'>-							   ICAL_ANY_COMPONENT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf ("CAL_OBJ_FIND_NOT_FOUND\n");</div><div class='del'>-	return CAL_OBJ_FIND_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-#else /* 1 */</div><div class='del'>-	VObject *vcal;</div><div class='del'>-	VObjectIterator i;</div><div class='del'>-	CalObjFindStatus status;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);</div><div class='del'>-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);</div><div class='del'>-	g_return_val_if_fail (ico != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);</div><div class='del'>-</div><div class='del'>-	*ico = NULL;</div><div class='del'>-	status = CAL_OBJ_FIND_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	vcal = Parse_MIME (vcalobj, strlen (vcalobj));</div><div class='del'>-</div><div class='del'>-	if (!vcal)</div><div class='del'>-		return CAL_OBJ_FIND_SYNTAX_ERROR;</div><div class='del'>-</div><div class='del'>-	initPropIterator (&amp;i, vcal);</div><div class='del'>-</div><div class='del'>-	while (moreIteration (&amp;i)) {</div><div class='del'>-		VObject *vobj;</div><div class='del'>-		VObject *uid_prop;</div><div class='del'>-		char *the_str;</div><div class='del'>-</div><div class='del'>-		vobj = nextVObject (&amp;i);</div><div class='del'>-</div><div class='del'>-		uid_prop = isAPropertyOf (vobj, VCUniqueStringProp);</div><div class='del'>-		if (!uid_prop)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* str_val() sets the_str to the string representation of the</div><div class='del'>-		 * property.</div><div class='del'>-		 */</div><div class='del'>-		str_val (uid_prop);</div><div class='del'>-</div><div class='del'>-		if (strcmp (the_str, uid) == 0) {</div><div class='del'>-			const char *object_name;</div><div class='del'>-</div><div class='del'>-			object_name = vObjectName (vobj);</div><div class='del'>-			*ico = ical_object_create_from_vobject (vobj, object_name);</div><div class='del'>-</div><div class='del'>-			if (*ico)</div><div class='del'>-				status = CAL_OBJ_FIND_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		free (the_str);</div><div class='del'>-</div><div class='del'>-		if (status == CAL_OBJ_FIND_SUCCESS)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cleanVObject (vcal);</div><div class='del'>-	cleanStrTbl ();</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-#endif /* 1 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-/* Creates a VObject with the base information of a calendar */</div><div class='del'>-static VObject *</div><div class='del'>-get_calendar_base_vobject (void)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj;</div><div class='del'>-	time_t now;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	/* We call localtime for the side effect of setting tzname */</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-	tm = *localtime (&amp;now);</div><div class='del'>-</div><div class='del'>-	vobj = newVObject (VCCalProp);</div><div class='del'>-</div><div class='del'>-	addPropValue (vobj, VCProdIdProp, PRODID);</div><div class='del'>-</div><div class='del'>-#if defined (HAVE_TM_ZONE)</div><div class='del'>-	addPropValue (vobj, VCTimeZoneProp, tm.tm_zone);</div><div class='del'>-#elif defined (HAVE_TZNAME)</div><div class='del'>-	addPropValue (vobj, VCTimeZoneProp, tzname[0]);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Per the vCalendar spec, this must be "1.0" */</div><div class='del'>-	addPropValue (vobj, VCVersionProp, "1.0");</div><div class='del'>-</div><div class='del'>-	return vobj;</div><div class='del'>-}</div><div class='del'>-#endif /* 0 */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ical_object_to_string:</div><div class='del'>- * @ico: A calendar object.</div><div class='del'>- * </div><div class='del'>- * Converts a vCalendar object to its string representation.  It is wrapped</div><div class='del'>- * inside a complete VCALENDAR object because other auxiliary information such</div><div class='del'>- * as timezones may appear there.</div><div class='del'>- * </div><div class='del'>- * Return value: String representation of the object.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-ical_object_to_string (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);</div><div class='del'>-	char *out_cal_string;</div><div class='del'>-	icalcomponent *comp;</div><div class='del'>-</div><div class='del'>-	printf ("ical_object_to_string:\n");</div><div class='del'>-	printf ("-----------------------------------------------------\n");</div><div class='del'>-	dump_icalobject (ico);</div><div class='del'>-	printf ("-----------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-	comp = icalcomponent_create_from_ical_object (ico);</div><div class='del'>-	icalcomponent_add_component (top, comp);</div><div class='del'>-	out_cal_string = icalcomponent_as_ical_string (top);</div><div class='del'>-	return g_strdup (out_cal_string);</div><div class='del'>-</div><div class='del'>-#else /* 1 */</div><div class='del'>-	VObject *vcalobj, *vobj;</div><div class='del'>-	char *buf, *gbuf;</div><div class='del'>-</div><div class='del'>-	vcalobj = get_calendar_base_vobject ();</div><div class='del'>-	vobj = ical_object_to_vobject (ico);</div><div class='del'>-	addVObjectProp (vcalobj, vobj);</div><div class='del'>-</div><div class='del'>-	buf = writeMemVObject (NULL, NULL, vcalobj);</div><div class='del'>-</div><div class='del'>-	cleanVObject (vcalobj);</div><div class='del'>-	cleanStrTbl ();</div><div class='del'>-</div><div class='del'>-	/* We have to g_strdup() it because libversit uses malloc()/realloc(),</div><div class='del'>-	 * and we want clients to be able to use g_free().  Sigh.</div><div class='del'>-	 */</div><div class='del'>-	gbuf = g_strdup (buf);</div><div class='del'>-	free (buf);</div><div class='del'>-</div><div class='del'>-	return gbuf;</div><div class='del'>-#endif /* 1 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ical_object_compare_dates:</div><div class='del'>- * @ico1: A calendar event.</div><div class='del'>- * @ico2: A calendar event to compare with @ico1.</div><div class='del'>- * </div><div class='del'>- * Returns TRUE if the dates of both objects match, including any recurrence</div><div class='del'>- * rules. Both calendar objects must have a type of ICAL_EVENT.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if both calendar objects have the same dates.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-ical_object_compare_dates (iCalObject *ico1,</div><div class='del'>-			   iCalObject *ico2)</div><div class='del'>-{</div><div class='del'>-	Recurrence *recur1, *recur2;</div><div class='del'>-	gint num_exdates;</div><div class='del'>-	GList *elem1, *elem2;</div><div class='del'>-	time_t *time1, *time2;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ico1 != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (ico2 != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (ico1-&gt;type == ICAL_EVENT, FALSE);</div><div class='del'>-	g_return_val_if_fail (ico2-&gt;type == ICAL_EVENT, FALSE);</div><div class='del'>-</div><div class='del'>-	/* First check the base dates. */</div><div class='del'>-	if (ico1-&gt;dtstart != ico2-&gt;dtstart</div><div class='del'>-	    || ico1-&gt;dtend != ico2-&gt;dtend)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	recur1 = ico1-&gt;recur;</div><div class='del'>-	recur2 = ico2-&gt;recur;</div><div class='del'>-</div><div class='del'>-	/* If the event doesn't recur, we already know it matches. */</div><div class='del'>-	if (!recur1 &amp;&amp; !recur2)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* Check that both recur. */</div><div class='del'>-	if (!(recur1 &amp;&amp; recur2))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Now we need to see if the recurrence rules are the same. */</div><div class='del'>-	if (recur1-&gt;type != recur2-&gt;type</div><div class='del'>-	    || recur1-&gt;interval != recur2-&gt;interval</div><div class='del'>-	    || recur1-&gt;enddate != recur2-&gt;enddate</div><div class='del'>-	    || recur1-&gt;weekday != recur2-&gt;weekday</div><div class='del'>-	    || recur1-&gt;duration != recur2-&gt;duration</div><div class='del'>-	    || recur1-&gt;_enddate != recur2-&gt;_enddate</div><div class='del'>-	    || recur1-&gt;__count != recur2-&gt;__count)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	switch (recur1-&gt;type) {</div><div class='del'>-	case RECUR_MONTHLY_BY_POS:</div><div class='del'>-		if (recur1-&gt;u.month_pos != recur2-&gt;u.month_pos)</div><div class='del'>-			return FALSE;</div><div class='del'>-		break;</div><div class='del'>-	case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-		if (recur1-&gt;u.month_day != recur2-&gt;u.month_day)</div><div class='del'>-			return FALSE;</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'>-	/* Now check if the excluded dates match. */</div><div class='del'>-	num_exdates = g_list_length (ico1-&gt;exdate);</div><div class='del'>-	if (g_list_length (ico2-&gt;exdate) != num_exdates)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (num_exdates == 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	ico1-&gt;exdate = g_list_sort (ico1-&gt;exdate, compare_exdates);</div><div class='del'>-	ico2-&gt;exdate = g_list_sort (ico2-&gt;exdate, compare_exdates);</div><div class='del'>-</div><div class='del'>-	elem1 = ico1-&gt;exdate;</div><div class='del'>-	elem2 = ico2-&gt;exdate;</div><div class='del'>-	while (elem1) {</div><div class='del'>-		time1 = (time_t*) elem1-&gt;data;</div><div class='del'>-		time2 = (time_t*) elem2-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (*time1 != *time2)</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		elem1 = elem1-&gt;next;</div><div class='del'>-		elem2 = elem2-&gt;next;</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 gint</div><div class='del'>-compare_exdates (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const time_t *ca = a, *cb = b;</div><div class='del'>-	time_t diff = *ca - *cb;</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'>-/* Converts any CR/LF sequences in the summary field to spaces so we just</div><div class='del'>-   have a one-line field. The iCalObjects summary field is changed. */</div><div class='del'>-static void</div><div class='del'>-ical_object_normalize_summary (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	gchar *src, *dest, ch;</div><div class='del'>-	gboolean just_output_space = FALSE;</div><div class='del'>-</div><div class='del'>-	src = dest = ico-&gt;summary;</div><div class='del'>-	while ((ch = *src++)) {</div><div class='del'>-		if (ch == '\n' || ch == '\r') {</div><div class='del'>-			/* We only output 1 space for each sequence of CR &amp; LF</div><div class='del'>-			   characters. */</div><div class='del'>-			if (!just_output_space) {</div><div class='del'>-				*dest++ = ' ';</div><div class='del'>-				just_output_space = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			*dest++ = ch;</div><div class='del'>-			just_output_space = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*dest = '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void dump_icalobject (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	if (!ico) {</div><div class='del'>-		printf ("&lt;&lt;NULL&gt;&gt;\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf ("type ");</div><div class='del'>-	switch (ico-&gt;type) {</div><div class='del'>-	case ICAL_EVENT: printf ("event"); break;</div><div class='del'>-	case ICAL_TODO: printf ("todo"); break;</div><div class='del'>-	case ICAL_JOURNAL: printf ("journal"); break;</div><div class='del'>-	case ICAL_FBREQUEST: printf ("fbrequest"); break;</div><div class='del'>-	case ICAL_FBREPLY: printf ("fbreply"); break;</div><div class='del'>-	case ICAL_BUSYTIME: printf ("busytime"); break;</div><div class='del'>-	case ICAL_TIMEZONE: printf ("timezone"); break;</div><div class='del'>-	}</div><div class='del'>-	printf ("\n");</div><div class='del'>-</div><div class='del'>-	printf ("attach-length %d\n", g_list_length (ico-&gt;attach));</div><div class='del'>-</div><div class='del'>-	printf ("attendee-length %d\n", g_list_length (ico-&gt;attendee));</div><div class='del'>-</div><div class='del'>-	printf ("catagories-length %d\n", g_list_length (ico-&gt;categories));</div><div class='del'>-</div><div class='del'>-	printf ("class '%s'\n", ico-&gt;class ? ico-&gt;class : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("comment '%s'\n", ico-&gt;comment ? ico-&gt;comment : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("completed %ld=%s",</div><div class='del'>-		ico-&gt;completed, ctime (&amp;ico-&gt;completed));</div><div class='del'>-</div><div class='del'>-	printf ("created %ld=%s", ico-&gt;created, ctime (&amp;ico-&gt;created));</div><div class='del'>-</div><div class='del'>-	printf ("contact-length %d\n", g_list_length (ico-&gt;contact));</div><div class='del'>-</div><div class='del'>-	printf ("desc '%s'\n", ico-&gt;desc ? ico-&gt;desc : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("dtstamp %ld=%s", ico-&gt;dtstamp, ctime (&amp;ico-&gt;dtstamp));</div><div class='del'>-</div><div class='del'>-	printf ("dtstart %ld=%s", ico-&gt;dtstart, ctime (&amp;ico-&gt;dtstart));</div><div class='del'>-</div><div class='del'>-	printf ("dtend %ld=%s", ico-&gt;dtend, ctime (&amp;ico-&gt;dtend));</div><div class='del'>-</div><div class='del'>-	printf ("date_only %d\n", ico-&gt;date_only);</div><div class='del'>-</div><div class='del'>-	printf ("exdate-length %d\n", g_list_length (ico-&gt;exdate));</div><div class='del'>-</div><div class='del'>-	printf ("exrule-length %d\n", g_list_length (ico-&gt;exrule));</div><div class='del'>-</div><div class='del'>-	printf ("iCalGeo %d %f %f\n",</div><div class='del'>-		ico-&gt;geo.valid, ico-&gt;geo.latitude, ico-&gt;geo.longitude);</div><div class='del'>-</div><div class='del'>-	printf ("last_mod %ld=%s", ico-&gt;last_mod, ctime (&amp;ico-&gt;last_mod));</div><div class='del'>-</div><div class='del'>-	printf ("location '%s'\n", ico-&gt;location ? ico-&gt;location : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("organizer %p\n", ico-&gt;organizer);</div><div class='del'>-</div><div class='del'>-	printf ("percent %d\n", ico-&gt;percent);</div><div class='del'>-</div><div class='del'>-	printf ("priority %d\n", ico-&gt;priority);</div><div class='del'>-</div><div class='del'>-	printf ("rstatus '%s'\n", ico-&gt;rstatus ? ico-&gt;rstatus : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("related-length %d\n", g_list_length (ico-&gt;related));</div><div class='del'>-</div><div class='del'>-	printf ("resources-length %d\n", g_list_length (ico-&gt;resources));</div><div class='del'>-</div><div class='del'>-	printf ("rdate-length %d\n", g_list_length (ico-&gt;rdate));</div><div class='del'>-</div><div class='del'>-	printf ("rrule-length %d\n", g_list_length (ico-&gt;rrule));</div><div class='del'>-</div><div class='del'>-	printf ("seq %d\n", ico-&gt;seq);</div><div class='del'>-</div><div class='del'>-	printf ("status '%s'\n", ico-&gt;status ? ico-&gt;status : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("summary '%s'\n", ico-&gt;summary ? ico-&gt;summary : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("transp ");</div><div class='del'>-	switch (ico-&gt;transp) {</div><div class='del'>-	case ICAL_OPAQUE: printf ("opaque"); break;</div><div class='del'>-	case ICAL_TRANSPARENT: printf ("transparent"); break;</div><div class='del'>-	}</div><div class='del'>-	printf ("\n");</div><div class='del'>-</div><div class='del'>-	printf ("uid '%s'\n", ico-&gt;uid ? ico-&gt;uid : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("url '%s'\n", ico-&gt;url ? ico-&gt;url : "NULL");</div><div class='del'>-</div><div class='del'>-	printf ("recurid %ld=%s", ico-&gt;recurid, ctime (&amp;ico-&gt;recurid));</div><div class='del'>-</div><div class='del'>-	printf ("dalarm %d\n", ico-&gt;dalarm.enabled);</div><div class='del'>-</div><div class='del'>-	printf ("aalarm %d\n", ico-&gt;aalarm.enabled);</div><div class='del'>-</div><div class='del'>-	printf ("palarm %d\n", ico-&gt;palarm.enabled);</div><div class='del'>-</div><div class='del'>-	printf ("malarm %d\n", ico-&gt;malarm.enabled);</div><div class='del'>-</div><div class='del'>-	printf ("alarms-length %d\n", g_list_length (ico-&gt;alarms));</div><div class='del'>-</div><div class='del'>-	printf ("recur %p\n", ico-&gt;recur);</div><div class='del'>-</div><div class='del'>-	printf ("new %d\n", ico-&gt;new);</div><div class='del'>-</div><div class='del'>-	printf ("user_data %p\n", ico-&gt;user_data);</div><div class='del'>-</div><div class='del'>-	printf ("ref_count %d\n", ico-&gt;ref_count);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h<br/>deleted file mode 100644<br/>index bb0840fb67..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/calobj.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/calobj.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,306 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Internal representation of a Calendar object.  This is modeled after the</div><div class='del'>- * iCalendar/vCalendar specificiation</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza (miguel@gnu.org)</div><div class='del'>- *          Federico Mena (quartic@gimp.org).</div><div class='del'>- */</div><div class='del'>-#ifndef CALOBJ_H</div><div class='del'>-#define CALOBJ_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/libgnome.h&gt;</div><div class='del'>-#include "libversit/vcc.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-/* Alarm types */</div><div class='del'>-enum AlarmType {</div><div class='del'>-	ALARM_MAIL,</div><div class='del'>-	ALARM_PROGRAM,</div><div class='del'>-	ALARM_DISPLAY,</div><div class='del'>-	ALARM_AUDIO</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Whether the alarm should trigger N mins/hours/days before its due time */</div><div class='del'>-enum AlarmUnit {</div><div class='del'>-	ALARM_MINUTES,</div><div class='del'>-	ALARM_HOURS,</div><div class='del'>-	ALARM_DAYS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Field identifiers for the iCalObject structure */</div><div class='del'>-typedef enum {</div><div class='del'>-	ICAL_OBJECT_FIELD_COMMENT,</div><div class='del'>-	ICAL_OBJECT_FIELD_COMPLETED,</div><div class='del'>-	ICAL_OBJECT_FIELD_CREATED,</div><div class='del'>-	ICAL_OBJECT_FIELD_DESCRIPTION,</div><div class='del'>-	ICAL_OBJECT_FIELD_DTSTAMP,</div><div class='del'>-	ICAL_OBJECT_FIELD_DTSTART,</div><div class='del'>-	ICAL_OBJECT_FIELD_DTEND,</div><div class='del'>-	ICAL_OBJECT_FIELD_GEO,</div><div class='del'>-	ICAL_OBJECT_FIELD_LAST_MOD,</div><div class='del'>-	ICAL_OBJECT_FIELD_LOCATION,</div><div class='del'>-	ICAL_OBJECT_FIELD_ORGANIZER,</div><div class='del'>-	ICAL_OBJECT_FIELD_PERCENT,</div><div class='del'>-	ICAL_OBJECT_FIELD_PRIORITY,</div><div class='del'>-	ICAL_OBJECT_FIELD_SUMMARY,</div><div class='del'>-	ICAL_OBJECT_FIELD_URL,</div><div class='del'>-	ICAL_OBJECT_FIELD_HAS_ALARMS, /* not a real field */</div><div class='del'>-	ICAL_OBJECT_FIELD_NUM_FIELDS</div><div class='del'>-} iCalObjectField;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	enum AlarmType type;</div><div class='del'>-	int            enabled;</div><div class='del'>-	int            count;</div><div class='del'>-	enum AlarmUnit units;</div><div class='del'>-	char           *data;	/* not used for iCalendar alarms */</div><div class='del'>-</div><div class='del'>-	/* the following pointers are used for iCalendar alarms */</div><div class='del'>-</div><div class='del'>-	char           *attach;	           /* AUDIO, EMAIL, PROC */</div><div class='del'>-	char           *desc;	           /* DISPLAY, EMAIL, PROC */</div><div class='del'>-	char           *summary;           /* EMAIL */</div><div class='del'>-	char           *attendee;          /* EMAIL */</div><div class='del'>-</div><div class='del'>-	/* Does not get saved, internally used */</div><div class='del'>-	time_t         offset;</div><div class='del'>-	time_t         trigger;</div><div class='del'>-</div><div class='del'>-	int            snooze_secs;</div><div class='del'>-	int	       snooze_repeat;</div><div class='del'>-	</div><div class='del'>-	/* Widgets */</div><div class='del'>-	void           *w_count;      /* A GtkEntry */</div><div class='del'>-	void           *w_enabled;    /* A GtkChecButton */</div><div class='del'>-	void           *w_timesel;    /* A GtkMenu */</div><div class='del'>-	void           *w_entry;      /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */</div><div class='del'>-	void           *w_label;</div><div class='del'>-} CalendarAlarm;</div><div class='del'>-</div><div class='del'>-/* Calendar object type */</div><div class='del'>-typedef enum {</div><div class='del'>-	ICAL_EVENT,</div><div class='del'>-	ICAL_TODO,</div><div class='del'>-	ICAL_JOURNAL,</div><div class='del'>-	ICAL_FBREQUEST,</div><div class='del'>-	ICAL_FBREPLY,</div><div class='del'>-	ICAL_BUSYTIME,</div><div class='del'>-	ICAL_TIMEZONE</div><div class='del'>-} iCalType;</div><div class='del'>-</div><div class='del'>-/* For keys that might contain binary or text/binary */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *data;</div><div class='del'>-	int  len;</div><div class='del'>-} iCalValue;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ICAL_PILOT_SYNC_NONE = 0,</div><div class='del'>-	ICAL_PILOT_SYNC_MOD  = 1,</div><div class='del'>-	ICAL_PILOT_SYNC_DEL  = 3</div><div class='del'>-} iCalPilotState;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int     valid;		/* true if the Geography was specified */</div><div class='del'>-	double  latitude;</div><div class='del'>-	double  longitude;</div><div class='del'>-} iCalGeo;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ICAL_OPAQUE,</div><div class='del'>-	ICAL_TRANSPARENT</div><div class='del'>-} iCalTransp;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char   *uid;</div><div class='del'>-	char   *reltype;</div><div class='del'>-} iCalRelation;</div><div class='del'>-</div><div class='del'>-typedef char NotYet;</div><div class='del'>-</div><div class='del'>-enum RecurType {</div><div class='del'>-	RECUR_DAILY,</div><div class='del'>-	RECUR_WEEKLY,</div><div class='del'>-	RECUR_MONTHLY_BY_POS,</div><div class='del'>-	RECUR_MONTHLY_BY_DAY,</div><div class='del'>-	RECUR_YEARLY_BY_MONTH,</div><div class='del'>-	RECUR_YEARLY_BY_DAY,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DAY_LASTDAY 10000</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	enum RecurType type;</div><div class='del'>-</div><div class='del'>-	int            interval;</div><div class='del'>-</div><div class='del'>-	/* Used for recur computation */</div><div class='del'>-	time_t         enddate;	/* If the value is zero, it is an infinite event</div><div class='del'>-				 * otherwise, it is either the _enddate value (if</div><div class='del'>-				 * this is what got specified)  or it is our computed</div><div class='del'>-				 * ending date (computed from the duration item).</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-	int            weekday;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		int    month_pos;</div><div class='del'>-		int    month_day;</div><div class='del'>-	} u;</div><div class='del'>-</div><div class='del'>-	int            duration;</div><div class='del'>-	time_t         _enddate; /* As found on the vCalendar file */</div><div class='del'>-	int            __count;</div><div class='del'>-} Recurrence;</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-   NOTE: iCalPerson is used for various property values which specify</div><div class='del'>-   people (e.g. ATTENDEE, ORGANIZER, etc.  Not all fields are valid</div><div class='del'>-   under RFC 2445 for all property values, but iCalPerson can store</div><div class='del'>-   them anyway.  Enforcing the RFC is a job for the parser.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char          *addr;</div><div class='del'>-	char          *name;</div><div class='del'>-	char          *role;</div><div class='del'>-	char          *partstat;</div><div class='del'>-	gboolean      rsvp;</div><div class='del'>-	char          *cutype;	/* calendar user type */</div><div class='del'>-	GList         *member;	/* group memberships */</div><div class='del'>-	GList         *deleg_to;</div><div class='del'>-	GList         *deleg_from;</div><div class='del'>-	char          *sent_by;</div><div class='del'>-	char          *directory;</div><div class='del'>-	GList         *altrep;	/* list of char* URI's */</div><div class='del'>-} iCalPerson;</div><div class='del'>-</div><div class='del'>-#define IS_INFINITE(r) (r-&gt;duration == 0)</div><div class='del'>-</div><div class='del'>-/* Flags to indicate what has changed in an object */</div><div class='del'>-typedef enum {</div><div class='del'>-	CHANGE_NEW     = 1 &lt;&lt; 0,	/* new object */</div><div class='del'>-	CHANGE_SUMMARY = 1 &lt;&lt; 1,	/* summary */</div><div class='del'>-	CHANGE_DATES   = 1 &lt;&lt; 2,	/* dtstart / dtend */</div><div class='del'>-	CHANGE_ALL     = CHANGE_SUMMARY | CHANGE_DATES</div><div class='del'>-} CalObjectChange;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This describes an iCalendar object, note that we never store durations, instead we</div><div class='del'>- * always compute the end time computed from the start + duration.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	iCalType      type;</div><div class='del'>-</div><div class='del'>-	GList         *attach;		/* type: one or more URIs or binary data */</div><div class='del'>-        GList         *attendee; 	/* type: CAL-ADDRESS (list of iCalPerson) */</div><div class='del'>-	GList         *categories; 	/* type: one or more TEXT */</div><div class='del'>-	char          *class;</div><div class='del'>-</div><div class='del'>-	char          *comment;		/* we collapse one or more TEXTs into one */</div><div class='del'>-	time_t        completed;</div><div class='del'>-	time_t        created;</div><div class='del'>-	GList         *contact;		/* type: one or more TEXT */</div><div class='del'>-	char          *desc;</div><div class='del'>-	time_t        dtstamp;</div><div class='del'>-	time_t        dtstart;</div><div class='del'>-	time_t        dtend;            /* also duedate for todo's */</div><div class='del'>-        gboolean      date_only;        /* set if the start/end times were</div><div class='del'>-   specified using dates, not times (internal use, not stored to disk) */</div><div class='del'>-	GList         *exdate;		/* type: one or more time_t's */</div><div class='del'>-	GList         *exrule;		/* type: one or more RECUR */</div><div class='del'>-	iCalGeo       geo;</div><div class='del'>-	time_t        last_mod;</div><div class='del'>-	char          *location;</div><div class='del'>-	iCalPerson    *organizer;</div><div class='del'>-	int           percent;</div><div class='del'>-	int           priority;</div><div class='del'>-	char          *rstatus;	        /* request status for freebusy */</div><div class='del'>-	GList         *related;		/* type: one or more TEXT */</div><div class='del'>-	GList         *resources;	/* type: one or more TEXT */</div><div class='del'>-	GList         *rdate;		/* type: one or more recurrence date */</div><div class='del'>-	GList         *rrule;		/* type: one or more recurrence rules */</div><div class='del'>-	int           seq;</div><div class='del'>-	char          *status;</div><div class='del'>-	char          *summary;</div><div class='del'>-	iCalTransp    transp;</div><div class='del'>-	char          *uid;</div><div class='del'>-	char          *url;</div><div class='del'>-	time_t        recurid;</div><div class='del'>-</div><div class='del'>-	CalendarAlarm dalarm;</div><div class='del'>-	CalendarAlarm aalarm;</div><div class='del'>-	CalendarAlarm palarm;</div><div class='del'>-	CalendarAlarm malarm;</div><div class='del'>-</div><div class='del'>-	GList         *alarms;</div><div class='del'>-</div><div class='del'>-	Recurrence    *recur;</div><div class='del'>-	</div><div class='del'>-	int new;</div><div class='del'>-	void *user_data;		/* Generic data pointer */</div><div class='del'>-</div><div class='del'>-	/* Pilot */</div><div class='del'>-	iCalPilotState pilot_status;    /* Status information */</div><div class='del'>-	guint32            pilot_id;        /* Pilot ID */</div><div class='del'>-</div><div class='del'>-	guint	       ref_count;</div><div class='del'>-} iCalObject;</div><div class='del'>-</div><div class='del'>-/* The callback for the recurrence generator */</div><div class='del'>-typedef int (*calendarfn) (iCalObject *, time_t, time_t, void *);</div><div class='del'>-</div><div class='del'>-iCalObject *ical_new                        (char *comment, char *organizer, char *summary);</div><div class='del'>-iCalObject *ical_object_new                 (void);</div><div class='del'>-</div><div class='del'>-void        ical_object_ref                 (iCalObject *ico);</div><div class='del'>-void        ical_object_unref               (iCalObject *ico);</div><div class='del'>-</div><div class='del'>-iCalObject *ical_object_create_from_vobject (VObject *obj, const char *object_name);</div><div class='del'>-VObject    *ical_object_to_vobject          (iCalObject *ical);</div><div class='del'>-iCalObject *ical_object_duplicate           (iCalObject *o);</div><div class='del'>-void        ical_foreach                    (GList *events, calendarfn fn, void *closure);</div><div class='del'>-void        ical_object_generate_events     (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure);</div><div class='del'>-void        ical_object_add_exdate          (iCalObject *o, time_t t);</div><div class='del'>-</div><div class='del'>-/* Computes the enddate field of the recurrence based on the duration */</div><div class='del'>-void        ical_object_compute_end         (iCalObject *ico);</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_OBJ_FIND_SUCCESS,</div><div class='del'>-	CAL_OBJ_FIND_SYNTAX_ERROR,</div><div class='del'>-	CAL_OBJ_FIND_NOT_FOUND</div><div class='del'>-} CalObjFindStatus;</div><div class='del'>-</div><div class='del'>-CalObjFindStatus ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico);</div><div class='del'>-</div><div class='del'>-char       *ical_object_to_string (iCalObject *ico);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple</div><div class='del'>- * days on a monthly-by-pos recurrence.  If no days are toggled, it returns -1.</div><div class='del'>- */</div><div class='del'>-int	    ical_object_get_first_weekday (int weekday_mask);</div><div class='del'>-</div><div class='del'>-/* Returns the number of seconds configured to trigger the alarm in advance to an event */</div><div class='del'>-int         alarm_compute_offset (CalendarAlarm *a);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the dates of both objects match, including any recurrence</div><div class='del'>-   rules. */</div><div class='del'>-gboolean    ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);</div><div class='del'>-</div><div class='del'>-/* Generates a new uid for a calendar object. Should be g_free'd eventually. */</div><div class='del'>-char	   *ical_gen_uid (void);</div><div class='del'>-</div><div class='del'>-/* This resets any recurrence rules of the iCalObject. */</div><div class='del'>-void	    ical_object_reset_recurrence (iCalObject *ico);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void dump_icalobject (iCalObject *ico);</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/icalendar-save.c b/calendar/cal-util/icalendar-save.c<br/>deleted file mode 100644<br/>index 8f2335763f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/icalendar-save.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/icalendar-save.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,516 +0,0 @@</div><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 &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include "icalendar-save.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void unparse_person (iCalPerson *person, icalproperty *person_prop);</div><div class='del'>-static struct icaltimetype timet_to_icaltime (time_t tt);</div><div class='del'>-static icalproperty *unparse_related (iCalRelation *rel);</div><div class='del'>-static icalcomponent *unparse_alarm (CalendarAlarm *alarm);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-icalcomponent*</div><div class='del'>-icalcomponent_create_from_ical_object (iCalObject *ical)</div><div class='del'>-{</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-	icalcomponent *comp;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	switch (ical-&gt;type) {</div><div class='del'>-	case ICAL_EVENT: kind = ICAL_VEVENT_COMPONENT; break;</div><div class='del'>-	case ICAL_TODO: kind = ICAL_VTODO_COMPONENT; break;</div><div class='del'>-	case ICAL_JOURNAL: kind = ICAL_VJOURNAL_COMPONENT; break;</div><div class='del'>-	case ICAL_FBREQUEST: kind = ICAL_VFREEBUSY_COMPONENT; break;</div><div class='del'>-	case ICAL_TIMEZONE: kind = ICAL_VTIMEZONE_COMPONENT; break;</div><div class='del'>-	default:</div><div class='del'>-		kind = ICAL_NO_COMPONENT; break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp = icalcomponent_new (kind);</div><div class='del'>-</div><div class='del'>-	/*** calscale ***/</div><div class='del'>-	prop = icalproperty_new_calscale ("GREGORIAN");</div><div class='del'>-	icalcomponent_add_property (comp, prop);</div><div class='del'>-</div><div class='del'>-	/*** catagories ***/</div><div class='del'>-	if (ical-&gt;categories) {		</div><div class='del'>-		/* ical-&gt;categories is a GList of (char *) */</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;categories; cur; cur = cur-&gt;next) {</div><div class='del'>-			prop = icalproperty_new_categories ((char *) cur);</div><div class='del'>-			icalcomponent_add_property (comp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** class ***/</div><div class='del'>-	if (ical-&gt;class) {</div><div class='del'>-		prop = icalproperty_new_class (ical-&gt;class);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** comment ***/</div><div class='del'>-	if (ical-&gt;comment) {</div><div class='del'>-		prop = icalproperty_new_comment (ical-&gt;comment);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** description ***/</div><div class='del'>-	if (ical-&gt;desc) {</div><div class='del'>-		prop = icalproperty_new_description (ical-&gt;desc);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** geo ***/</div><div class='del'>-	if (ical-&gt;geo.valid) {</div><div class='del'>-		struct icalgeotype v;</div><div class='del'>-		v.lat = ical-&gt;geo.latitude;</div><div class='del'>-		v.lon = ical-&gt;geo.longitude;</div><div class='del'>-		prop = icalproperty_new_geo (v);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** location ***/</div><div class='del'>-	if (ical-&gt;location) {</div><div class='del'>-		prop = icalproperty_new_location (ical-&gt;location);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** percentcomplete ***/</div><div class='del'>-	prop = icalproperty_new_percentcomplete (ical-&gt;percent);</div><div class='del'>-	icalcomponent_add_property (comp, prop);</div><div class='del'>-</div><div class='del'>-	/*** priority ***/</div><div class='del'>-	if (ical-&gt;priority) {</div><div class='del'>-		prop = icalproperty_new_priority (ical-&gt;priority);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** resources ***/</div><div class='del'>-	if (ical-&gt;resources) {</div><div class='del'>-		/* ical-&gt;resources is a GList of (char *) */</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;resources; cur; cur = cur-&gt;next) {</div><div class='del'>-			prop = icalproperty_new_resources ((char *) cur);</div><div class='del'>-			icalcomponent_add_property (comp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** status ***/</div><div class='del'>-	if (ical-&gt;status) {</div><div class='del'>-		prop = icalproperty_new_status (ical-&gt;status);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** summary ***/</div><div class='del'>-	if (ical-&gt;summary) {</div><div class='del'>-		prop = icalproperty_new_summary (ical-&gt;summary);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** completed ***/</div><div class='del'>-	if (ical-&gt;completed) {</div><div class='del'>-		struct icaltimetype ictime;</div><div class='del'>-		ictime = timet_to_icaltime (ical-&gt;completed);</div><div class='del'>-		prop = icalproperty_new_completed (ictime);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** dtend ***/  /*** due ***/</div><div class='del'>-	if (ical-&gt;dtend) {</div><div class='del'>-		/* FIXME: We should handle timezone specifiers */</div><div class='del'>-		struct icaltimetype ictime;</div><div class='del'>-		ictime = timet_to_icaltime (ical-&gt;dtend);</div><div class='del'>-		if (ical-&gt;type == ICAL_TODO)</div><div class='del'>-			prop = icalproperty_new_due (ictime);</div><div class='del'>-		else</div><div class='del'>-			prop = icalproperty_new_dtend (ictime);</div><div class='del'>-		if (ical-&gt;date_only) {</div><div class='del'>-			icalparameter *param;</div><div class='del'>-			param = icalparameter_new (ICAL_VALUE_PARAMETER);</div><div class='del'>-			icalparameter_set_value (param, ICAL_VALUE_DATE);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-		}</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** dtstart ***/</div><div class='del'>-	if (ical-&gt;dtstart) {</div><div class='del'>-		/* FIXME: We should handle timezone specifiers */</div><div class='del'>-		struct icaltimetype ictime;</div><div class='del'>-		ictime = timet_to_icaltime (ical-&gt;dtstart);</div><div class='del'>-		prop = icalproperty_new_dtstart (ictime);</div><div class='del'>-		if (ical-&gt;date_only) {</div><div class='del'>-			icalparameter *param;</div><div class='del'>-			param = icalparameter_new (ICAL_VALUE_PARAMETER);</div><div class='del'>-			icalparameter_set_value (param, ICAL_VALUE_DATE);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-		}</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** duration ***/</div><div class='del'>-	{</div><div class='del'>-		/* FIX ME */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** freebusy ***/</div><div class='del'>-	{</div><div class='del'>-		/* FIX ME */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** transp ***/</div><div class='del'>-	{</div><div class='del'>-		if (ical-&gt;transp == ICAL_TRANSP_PROPERTY)</div><div class='del'>-			prop = icalproperty_new_transp ("TRANSPARENT");</div><div class='del'>-		else</div><div class='del'>-			prop = icalproperty_new_transp ("OPAQUE");</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	  ICAL_TZID_PROPERTY:</div><div class='del'>-	  ICAL_TZNAME_PROPERTY:</div><div class='del'>-	  ICAL_TZOFFSETFROM_PROPERTY:</div><div class='del'>-	  ICAL_TZOFFSETTO_PROPERTY:</div><div class='del'>-	  ICAL_TZURL_PROPERTY:</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/*** attendee ***/</div><div class='del'>-	if (ical-&gt;attendee) {</div><div class='del'>-		/* a list of (iCalPerson *) */</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;attendee; cur; cur = cur-&gt;next) {</div><div class='del'>-			iCalPerson *person = (iCalPerson *) cur-&gt;data;</div><div class='del'>-			prop = icalproperty_new_attendee (person-&gt;addr);</div><div class='del'>-			unparse_person (person, prop);</div><div class='del'>-			icalcomponent_add_property (comp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** contact ***/</div><div class='del'>-	if (ical-&gt;contact) {</div><div class='del'>-		/* a list of (iCalPerson *) */</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;contact; cur; cur = cur-&gt;next) {</div><div class='del'>-			iCalPerson *person = (iCalPerson *) cur-&gt;data;</div><div class='del'>-			prop = icalproperty_new_contact (person-&gt;addr);</div><div class='del'>-			unparse_person (person, prop);</div><div class='del'>-			icalcomponent_add_property (comp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** organizer ***/</div><div class='del'>-	if (ical-&gt;organizer) {</div><div class='del'>-		prop = icalproperty_new_organizer (ical-&gt;organizer-&gt;addr);</div><div class='del'>-		unparse_person (ical-&gt;organizer, prop);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** recurrenceid ***/</div><div class='del'>-	if (ical-&gt;recurid) {</div><div class='del'>-		struct icaltimetype ictime;</div><div class='del'>-		ictime = timet_to_icaltime (ical-&gt;recurid);</div><div class='del'>-		prop = icalproperty_new_recurrenceid (ictime);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** relatedto ***/</div><div class='del'>-</div><div class='del'>-	if (ical-&gt;related) {</div><div class='del'>-		/* a list of (iCalPerson *) */</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;related; cur; cur = cur-&gt;next) {</div><div class='del'>-			iCalRelation *related = (iCalRelation *) cur-&gt;data;</div><div class='del'>-			prop = unparse_related (related);</div><div class='del'>-			icalcomponent_add_property (comp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*** url ***/</div><div class='del'>-	if (ical-&gt;url) {</div><div class='del'>-		prop = icalproperty_new_url (ical-&gt;url);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** uid ***/</div><div class='del'>-	if (ical-&gt;uid) {</div><div class='del'>-		prop = icalproperty_new_uid (ical-&gt;uid);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** exdate ***/</div><div class='del'>-	if (ical-&gt;exdate) {</div><div class='del'>-		struct icaltimetype v;</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;exdate; cur; cur = cur-&gt;next) {</div><div class='del'>-			time_t t = (time_t) cur-&gt;data;</div><div class='del'>-			v = timet_to_icaltime (t);</div><div class='del'>-			prop = icalproperty_new_exdate (v);</div><div class='del'>-			icalcomponent_add_property (comp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** created ***/</div><div class='del'>-	if (ical-&gt;created) {</div><div class='del'>-		struct icaltimetype v;</div><div class='del'>-		v = timet_to_icaltime (ical-&gt;created);</div><div class='del'>-		prop = icalproperty_new_created (v);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** dtstamp ***/</div><div class='del'>-	if (ical-&gt;dtstamp) {</div><div class='del'>-		struct icaltimetype v;</div><div class='del'>-		v = timet_to_icaltime (ical-&gt;dtstamp);</div><div class='del'>-		prop = icalproperty_new_created (v);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** lastmodified ***/</div><div class='del'>-	if (ical-&gt;last_mod) {</div><div class='del'>-		struct icaltimetype v;</div><div class='del'>-		v = timet_to_icaltime (ical-&gt;last_mod);</div><div class='del'>-		prop = icalproperty_new_created (v);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** sequence ***/</div><div class='del'>-	if (ical-&gt;seq) {</div><div class='del'>-		prop = icalproperty_new_sequence (ical-&gt;seq);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*** requeststatus ***/</div><div class='del'>-	if (ical-&gt;rstatus) {</div><div class='del'>-		prop = icalproperty_new_requeststatus (ical-&gt;rstatus);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if there is a VALARM subcomponent, add it here */</div><div class='del'>-</div><div class='del'>-	if (ical-&gt;alarms) {</div><div class='del'>-		GList *cur;</div><div class='del'>-		for (cur = ical-&gt;alarms; cur; cur = cur-&gt;next) {</div><div class='del'>-			CalendarAlarm *alarm = (CalendarAlarm *) cur-&gt;data;</div><div class='del'>-			icalcomponent *subcomp = unparse_alarm (alarm);</div><div class='del'>-			icalcomponent_add_component (comp, subcomp);</div><div class='del'>-		}</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'>-/* FIX ME -- same as icaltimetype_from_timet in icaltypes.c */</div><div class='del'>-static</div><div class='del'>-struct icaltimetype timet_to_icaltime (time_t tt)</div><div class='del'>-{</div><div class='del'>-	struct tm *t;</div><div class='del'>-	struct icaltimetype i;</div><div class='del'>-</div><div class='del'>-	//t = gmtime (&amp;tt);</div><div class='del'>-	t = localtime (&amp;tt);</div><div class='del'>-</div><div class='del'>-	/*return tt - (i-&gt;is_utc ? timezone : 0); */</div><div class='del'>-	i.is_utc = 0;</div><div class='del'>-</div><div class='del'>-	i.year = t-&gt;tm_year + 1900;</div><div class='del'>-	i.month = t-&gt;tm_mon + 1;</div><div class='del'>-	i.day = t-&gt;tm_mday;</div><div class='del'>-</div><div class='del'>-	if (t-&gt;tm_hour == 0 &amp;&amp; t-&gt;tm_min == 0 &amp;&amp; t-&gt;tm_sec == 0) {</div><div class='del'>-		i.is_date = 1;</div><div class='del'>-		i.hour = 0;</div><div class='del'>-		i.minute = 0;</div><div class='del'>-		i.second = 0;</div><div class='del'>-	} else {</div><div class='del'>-		i.is_date = 0;</div><div class='del'>-		i.hour = t-&gt;tm_hour;</div><div class='del'>-		i.minute = t-&gt;tm_min;</div><div class='del'>-		i.second = t-&gt;tm_sec;</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'>-</div><div class='del'>-/* fills in "person_prop" with information from "person" */</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-void unparse_person (iCalPerson *person, icalproperty *person_prop)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	GList *cur;</div><div class='del'>-</div><div class='del'>-	/* convert iCalPerson to an icalproperty */</div><div class='del'>-</div><div class='del'>-	if (person-&gt;name) {</div><div class='del'>-		param = icalparameter_new_cn (person-&gt;name);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (person-&gt;role) {</div><div class='del'>-		if (g_strcasecmp (person-&gt;role, "CHAIR") == 0)</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_CHAIR);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;role, "REQPARTICIPANT") == 0)</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;role, "OPTPARTICIPANT") == 0)</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_OPTPARTICIPANT);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;role, "NONPARTICIPANT") == 0)</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_NONPARTICIPANT);</div><div class='del'>-		else</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_XNAME);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (person-&gt;partstat) {</div><div class='del'>-		if (g_strcasecmp (person-&gt;partstat, "NEEDSACTION") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;partstat, "ACCEPTED") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_ACCEPTED);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;partstat, "DECLINED") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_DECLINED);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;partstat, "TENTATIVE") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_TENTATIVE);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;partstat, "DELEGATED") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_DELEGATED);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;partstat, "COMPLETED") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_COMPLETED);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;partstat, "INPROCESS") == 0)</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_INPROCESS);</div><div class='del'>-		else /* FIX ME, NEEDSACTION instead? */</div><div class='del'>-			param = icalparameter_new_partstat (ICAL_PARTSTAT_XNAME);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (person-&gt;rsvp != FALSE) {</div><div class='del'>-		param = icalparameter_new_rsvp (TRUE);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (person-&gt;cutype) {</div><div class='del'>-		if (g_strcasecmp (person-&gt;cutype, "INDIVIDUAL") == 0)</div><div class='del'>-			param = icalparameter_new_cutype (ICAL_CUTYPE_INDIVIDUAL);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;cutype, "GROUP") == 0)</div><div class='del'>-			param = icalparameter_new_cutype (ICAL_CUTYPE_GROUP);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;cutype, "RESOURCE") == 0)</div><div class='del'>-			param = icalparameter_new_cutype (ICAL_CUTYPE_RESOURCE);</div><div class='del'>-		else if (g_strcasecmp (person-&gt;cutype, "ROOM") == 0)</div><div class='del'>-			param = icalparameter_new_cutype (ICAL_CUTYPE_ROOM);</div><div class='del'>-		else /* FIX ME, INDIVIDUAL instead? */</div><div class='del'>-			param = icalparameter_new_cutype (ICAL_CUTYPE_UNKNOWN);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* person-&gt;member is a list of ICAL_MEMBER_PARAMETER */</div><div class='del'>-	for (cur = person-&gt;member; cur; cur = cur-&gt;next) {</div><div class='del'>-		gchar *member = (gchar *) cur-&gt;data;</div><div class='del'>-		param = icalparameter_new_member (member);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* person-&gt;deleg_to is a list of ICAL_DELEGATEDTO_PARAMETER */</div><div class='del'>-	for (cur = person-&gt;deleg_to; cur; cur = cur-&gt;next) {</div><div class='del'>-		gchar *deleg_to = (gchar *) cur-&gt;data;</div><div class='del'>-		param = icalparameter_new_delegatedto (deleg_to);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ret-&gt;deleg_from is a list of ICAL_DELEGATEDFROM_PARAMETER */</div><div class='del'>-	for (cur = person-&gt;deleg_from; cur; cur = cur-&gt;next) {</div><div class='del'>-		gchar *deleg_from = (gchar *) cur-&gt;data;</div><div class='del'>-		param = icalparameter_new_delegatedfrom (deleg_from);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (person-&gt;sent_by) {</div><div class='del'>-		param = icalparameter_new_sentby (person-&gt;sent_by);</div><div class='del'>-		icalproperty_add_parameter (person_prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ret-&gt;deleg_to is a list of ICAL_DIR_PARAMETER */</div><div class='del'>-	/* FIX ME ... */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-icalproperty *unparse_related (iCalRelation *rel)</div><div class='del'>-{</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	prop = icalproperty_new_relatedto (rel-&gt;reltype);</div><div class='del'>-</div><div class='del'>-	icalproperty_set_relatedto (prop, rel-&gt;uid);</div><div class='del'>-</div><div class='del'>-	/* FIX ME  RELTYPE_XNAME ? */</div><div class='del'>-	</div><div class='del'>-	return prop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-icalcomponent *unparse_alarm (CalendarAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *comp = icalcomponent_new (ICAL_VALARM_COMPONENT);</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	prop = NULL;</div><div class='del'>-	switch (alarm-&gt;type){</div><div class='del'>-	case ALARM_AUDIO:</div><div class='del'>-		prop = icalproperty_new_action ("AUDIO");</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_DISPLAY:</div><div class='del'>-		prop = icalproperty_new_action ("DISPLAY");</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_MAIL:</div><div class='del'>-		prop = icalproperty_new_action ("EMAIL");</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_PROGRAM:</div><div class='del'>-		prop = icalproperty_new_action ("PROCEDURE");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unsupported alarm type!");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (prop)</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;snooze_repeat)</div><div class='del'>-		prop = icalproperty_new_repeat (alarm-&gt;snooze_repeat);</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;snooze_secs) {</div><div class='del'>-		struct icaldurationtype dur;</div><div class='del'>-		dur = icaldurationtype_from_timet (alarm-&gt;snooze_secs);</div><div class='del'>-		prop = icalproperty_new_duration (dur);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;attach) {</div><div class='del'>-		struct icalattachtype *attach;</div><div class='del'>-		attach = icalattachtype_new ();</div><div class='del'>-		icalattachtype_set_url (attach, alarm-&gt;attach);</div><div class='del'>-		prop = icalproperty_new_attach (*attach);</div><div class='del'>-		icalattachtype_free (attach);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;desc) {</div><div class='del'>-		prop = icalproperty_new_description (alarm-&gt;desc);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;summary) {</div><div class='del'>-		prop = icalproperty_new_summary (alarm-&gt;summary);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;attendee) {</div><div class='del'>-		icalproperty_new_attendee (alarm-&gt;attendee);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/icalendar-save.h b/calendar/cal-util/icalendar-save.h<br/>deleted file mode 100644<br/>index 1e0ab59e70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/icalendar-save.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/icalendar-save.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-#ifndef ICALENDAR_SAVE_H</div><div class='del'>-#define ICALENDAR_SAVE_H</div><div class='del'>-</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-icalcomponent *icalcomponent_create_from_ical_object (iCalObject *ical);</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/cal-util/icalendar-test.c b/calendar/cal-util/icalendar-test.c<br/>deleted file mode 100644<br/>index 921e109a2c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/icalendar-test.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/icalendar-test.c</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'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</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;cal-util/calobj.h&gt;</div><div class='del'>-#include "libversit/vcc.h"</div><div class='del'>-</div><div class='del'>-#include "icalendar-save.h"</div><div class='del'>-#include "icalendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static icalcomponent* </div><div class='del'>-icalendar_parse_file (char* fname)</div><div class='del'>-{</div><div class='del'>-	FILE* fp;</div><div class='del'>-	icalcomponent* comp = NULL;</div><div class='del'>-	gchar* str;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	fp = fopen (fname, "r");</div><div class='del'>-	if (!fp) {</div><div class='del'>-		g_warning ("Cannot open open calendar file.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	stat (fname, &amp;st);</div><div class='del'>-	</div><div class='del'>-	str = g_malloc (st.st_size + 2);</div><div class='del'>-	</div><div class='del'>-	n = fread ((gchar*) str, 1, st.st_size, fp);</div><div class='del'>-	if (n != st.st_size) {</div><div class='del'>-		g_warning ("Read error.");</div><div class='del'>-	}</div><div class='del'>-	str[n] = '\0';</div><div class='del'>-</div><div class='del'>-	fclose (fp);</div><div class='del'>-	</div><div class='del'>-	comp = icalparser_parse_string (str);</div><div class='del'>-	g_free (str);</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'>-static GList *</div><div class='del'>-icalendar_calendar_load (GList *icals, char *fname)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *comp;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-	iCalObject    *ical;</div><div class='del'>-</div><div class='del'>-	comp = icalendar_parse_file (fname);</div><div class='del'>-	subcomp = icalcomponent_get_first_component (comp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		ical = ical_object_create_from_icalcomponent (subcomp);</div><div class='del'>-		if (ical-&gt;type != ICAL_EVENT &amp;&amp; </div><div class='del'>-		    ical-&gt;type != ICAL_TODO  &amp;&amp;</div><div class='del'>-		    ical-&gt;type != ICAL_JOURNAL) {</div><div class='del'>-			g_warning ("Skipping unsupported iCalendar component");</div><div class='del'>-		} else {</div><div class='del'>-			printf ("prepending %p\n", ical);</div><div class='del'>-			icals = g_list_prepend (icals, ical);</div><div class='del'>-		}</div><div class='del'>-		subcomp = icalcomponent_get_next_component (comp,</div><div class='del'>-							   ICAL_ANY_COMPONENT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return icals;</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'>-icalendar_calendar_save (GList *icals, char *fname)</div><div class='del'>-{</div><div class='del'>-	GList *cur;</div><div class='del'>-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);</div><div class='del'>-	char *out_cal_string;</div><div class='del'>-</div><div class='del'>-	for (cur=icals; cur; cur=cur-&gt;next) {</div><div class='del'>-		iCalObject *ical = (iCalObject *) cur-&gt;data;</div><div class='del'>-		icalcomponent *comp;</div><div class='del'>-		comp = icalcomponent_create_from_ical_object (ical);</div><div class='del'>-		icalcomponent_add_component (top, comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out_cal_string = icalcomponent_as_ical_string (top);</div><div class='del'>-</div><div class='del'>-	printf ("---------------------------------------------------------\n");</div><div class='del'>-	printf ("%s", out_cal_string);</div><div class='del'>-}</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'>-	GList *icals = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	long int n0, n1;</div><div class='del'>-        struct icaldurationtype dt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* test icaldurationtype_from_timet */</div><div class='del'>-	srandom (time (0));</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;10; i++) {</div><div class='del'>-		n0 = random () % ((60 * 60 * 24 * 7) * 4);</div><div class='del'>-		dt = icaldurationtype_from_timet (n0);</div><div class='del'>-		n1 = icaldurationtype_as_timet (dt);</div><div class='del'>-</div><div class='del'>-		printf ("%ld -&gt; (%d %d %d %d %d) -&gt; %ld\n",</div><div class='del'>-			n0,</div><div class='del'>-			dt.weeks, dt.days, dt.hours, dt.minutes, dt.seconds,</div><div class='del'>-			n1);</div><div class='del'>-		if (n0 != n1) abort ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*****************/</div><div class='del'>-	/* test conversion of icalcomponents to and from iCalObjects */</div><div class='del'>-	/*****************/</div><div class='del'>-</div><div class='del'>-	/* load an ical file */</div><div class='del'>-</div><div class='del'>-	if (argc &lt; 2) {</div><div class='del'>-		printf ("give ical file as argument.\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icals = icalendar_calendar_load (icals, argv[ 1 ]);</div><div class='del'>-</div><div class='del'>-	printf ("loaded %d ical components\n", g_list_length (icals));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* save it back out */</div><div class='del'>-</div><div class='del'>-	icalendar_calendar_save (icals, "out.ical");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/icalendar.c b/calendar/cal-util/icalendar.c<br/>deleted file mode 100644<br/>index eedb732617..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/icalendar.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/icalendar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,674 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * icalendar server for gnomecal</div><div class='del'>- * </div><div class='del'>- * This module interfaces between libical and the gnomecal internal</div><div class='del'>- * representation</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- * Authors:</div><div class='del'>- *   Russell Steinthal (rms39@columbia.edu)</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;unistd.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include "icalendar.h"</div><div class='del'>-</div><div class='del'>-static time_t icaltime_to_timet (struct icaltimetype* i);</div><div class='del'>-static CalendarAlarm* parse_alarm (icalproperty *prop);</div><div class='del'>-static iCalPerson* parse_person (icalproperty *prop, gchar *value);</div><div class='del'>-static iCalRelation* parse_related (icalproperty *prop);</div><div class='del'>-</div><div class='del'>-/* Duplicate a string without memory leaks */</div><div class='del'>-static gchar* copy_str (gchar** store, gchar* src)</div><div class='del'>-{</div><div class='del'>-	if (*store)</div><div class='del'>-		g_free (*store);</div><div class='del'>-	return (*store = g_strdup (src));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList* </div><div class='del'>-copy_to_list (GList** store, gchar* src)</div><div class='del'>-{</div><div class='del'>-	*store = g_list_prepend (*store, g_strdup (src));</div><div class='del'>-	return *store;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-iCalObject *</div><div class='del'>-ical_object_create_from_icalcomponent (icalcomponent* comp)</div><div class='del'>-{</div><div class='del'>-	iCalObject    *ical = NULL;</div><div class='del'>-	iCalPerson    *person;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-	icalproperty  *prop;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	struct icaltimetype ictime;</div><div class='del'>-	time_t *pt;	</div><div class='del'>-	CalendarAlarm *alarm = NULL;</div><div class='del'>-	icalcomponent_kind compType;</div><div class='del'>-	struct icalgeotype geo;</div><div class='del'>-	struct icalperiodtype period; </div><div class='del'>-</div><div class='del'>-	gboolean root = FALSE;</div><div class='del'>-	gboolean attachment = FALSE;</div><div class='del'>-</div><div class='del'>-	char *tmpStr;		/* this is a library-owned string */</div><div class='del'>-</div><div class='del'>-	ical  = g_new0 (iCalObject, 1);</div><div class='del'>-</div><div class='del'>-	compType = icalcomponent_isa (comp);</div><div class='del'>-	</div><div class='del'>-	switch (compType) {</div><div class='del'>-	case ICAL_XROOT_COMPONENT:</div><div class='del'>-	     root = TRUE;</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_XATTACH_COMPONENT:</div><div class='del'>-	     attachment = TRUE;</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VEVENT_COMPONENT:</div><div class='del'>-	     ical-&gt;type = ICAL_EVENT;</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VTODO_COMPONENT:</div><div class='del'>-	     ical-&gt;type = ICAL_TODO;</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VJOURNAL_COMPONENT:</div><div class='del'>-	     ical-&gt;type = ICAL_JOURNAL;</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VCALENDAR_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VFREEBUSY_COMPONENT:</div><div class='del'>-	     ical-&gt;type = ICAL_FBREQUEST;</div><div class='del'>-	     /* NOTE: This is not conclusive- you need to analyze</div><div class='del'>-		properties to determine whether this is an</div><div class='del'>-		FBREQUEST or an FBREPLY */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VTIMEZONE_COMPONENT:</div><div class='del'>-	     ical-&gt;type = ICAL_TIMEZONE;</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VALARM_COMPONENT:</div><div class='del'>-	case ICAL_XAUDIOALARM_COMPONENT:</div><div class='del'>-	case ICAL_XDISPLAYALARM_COMPONENT:</div><div class='del'>-	case ICAL_XEMAILALARM_COMPONENT:</div><div class='del'>-	case ICAL_XPROCEDUREALARM_COMPONENT:</div><div class='del'>-	     /* this should not be reached, since this loop should</div><div class='del'>-		only be processing first level components */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_XSTANDARD_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_XDAYLIGHT_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_X_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VSCHEDULE_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_XLICINVALID_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_NO_COMPONENT:</div><div class='del'>-	case ICAL_ANY_COMPONENT:</div><div class='del'>-	     /* should not occur */</div><div class='del'>-	     break;</div><div class='del'>-	case ICAL_VQUERY_COMPONENT:</div><div class='del'>-	case ICAL_VCAR_COMPONENT:</div><div class='del'>-	case ICAL_VCOMMAND_COMPONENT:</div><div class='del'>-	     /* FIXME: what does this mean? */</div><div class='del'>-	     break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);</div><div class='del'>-	while (prop) {</div><div class='del'>-		switch (icalproperty_isa (prop)) {</div><div class='del'>-		case ICAL_CALSCALE_PROPERTY:</div><div class='del'>-			if (g_strcasecmp (icalproperty_get_calscale (prop),</div><div class='del'>-					  "GREGORIAN"))</div><div class='del'>-				g_warning ("Unknown calendar format.");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_METHOD_PROPERTY:</div><div class='del'>-			/* FIXME: implement something here */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ATTACH_PROPERTY:</div><div class='del'>-			/* FIXME: not yet implemented */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CATEGORIES_PROPERTY:</div><div class='del'>-			copy_to_list (&amp;ical-&gt;categories,</div><div class='del'>-				      icalproperty_get_categories (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CLASS_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;class, icalproperty_get_class (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_COMMENT_PROPERTY:</div><div class='del'>-			/*tmpStr = icalproperty_get_comment (prop);*/</div><div class='del'>-			tmpStr = g_strconcat (icalproperty_get_comment (prop),</div><div class='del'>-					      ical-&gt;comment,</div><div class='del'>-					      NULL);</div><div class='del'>-			if (ical-&gt;comment)</div><div class='del'>-				g_free (ical-&gt;comment);</div><div class='del'>-			ical-&gt;comment = tmpStr;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DESCRIPTION_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;desc, </div><div class='del'>-				  icalproperty_get_description (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_GEO_PROPERTY:</div><div class='del'>-			geo = icalproperty_get_geo (prop);</div><div class='del'>-			ical-&gt;geo.latitude = geo.lat;</div><div class='del'>-			ical-&gt;geo.longitude = geo.lon;</div><div class='del'>-			ical-&gt;geo.valid = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_LOCATION_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;location,</div><div class='del'>-				  icalproperty_get_location (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PERCENTCOMPLETE_PROPERTY:</div><div class='del'>-			ical-&gt;percent = icalproperty_get_percentcomplete (prop);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PRIORITY_PROPERTY:</div><div class='del'>-			ical-&gt;priority = icalproperty_get_priority (prop);</div><div class='del'>-			if (ical-&gt;priority &lt; 0 || ical-&gt;priority &gt; 9)</div><div class='del'>-				g_warning ("Priority out-of-range (see RFC2445)");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_RESOURCES_PROPERTY:</div><div class='del'>-			copy_to_list (&amp;ical-&gt;resources,</div><div class='del'>-				      icalproperty_get_resources (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_STATUS_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;status,</div><div class='del'>-				  icalproperty_get_status (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_SUMMARY_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;summary,</div><div class='del'>-				  icalproperty_get_summary (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_COMPLETED_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_completed (prop);</div><div class='del'>-			ical-&gt;completed = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DTEND_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_dtend (prop);</div><div class='del'>-			ical-&gt;dtend = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			param = icalproperty_get_first_parameter (prop,</div><div class='del'>-								  ICAL_VALUE_PARAMETER);</div><div class='del'>-			if (param)</div><div class='del'>-				ical-&gt;date_only = (icalparameter_get_value (param) == ICAL_VALUE_DATE);</div><div class='del'>-			/* FIXME: We should handle timezone specifiers */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DUE_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_due (prop);</div><div class='del'>-			ical-&gt;dtend = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			param = icalproperty_get_first_parameter (prop,</div><div class='del'>-								  ICAL_VALUE_PARAMETER);</div><div class='del'>-			ical-&gt;date_only = (icalparameter_get_value (param) == </div><div class='del'>-					   ICAL_VALUE_DATE);</div><div class='del'>-			/* FIXME: We should handle timezone specifiers */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DTSTART_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_dtstart (prop);</div><div class='del'>-			ical-&gt;dtstart = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			param = icalproperty_get_first_parameter (prop,</div><div class='del'>-								  ICAL_VALUE_PARAMETER);</div><div class='del'>-			if (param)</div><div class='del'>-				ical-&gt;date_only = (icalparameter_get_value (param) == ICAL_VALUE_DATE);</div><div class='del'>-			/* FIXME: We should handle timezone specifiers */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DURATION_PROPERTY:</div><div class='del'>-			/* FIXME: I don't see the necessary libical function */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_FREEBUSY_PROPERTY:</div><div class='del'>-			period = icalproperty_get_freebusy (prop);</div><div class='del'>-			ical-&gt;dtstart = icaltime_to_timet (&amp;(period.start));</div><div class='del'>-			/* FIXME: period.end is specified as being relative</div><div class='del'>-			   to start, so this may not be correct */</div><div class='del'>-			ical-&gt;dtend   = icaltime_to_timet (&amp;(period.end));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_TRANSP_PROPERTY:</div><div class='del'>-			tmpStr = icalproperty_get_transp (prop);</div><div class='del'>-			/* do not i18n the following string constant! */</div><div class='del'>-			if (!g_strcasecmp (tmpStr, "TRANSPARENT"))</div><div class='del'>-				ical-&gt;transp = ICAL_TRANSPARENT;</div><div class='del'>-			else</div><div class='del'>-				ical-&gt;transp = ICAL_OPAQUE;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_TZID_PROPERTY:</div><div class='del'>-		case ICAL_TZNAME_PROPERTY:</div><div class='del'>-		case ICAL_TZOFFSETFROM_PROPERTY:</div><div class='del'>-		case ICAL_TZOFFSETTO_PROPERTY:</div><div class='del'>-		case ICAL_TZURL_PROPERTY:</div><div class='del'>-			/* no implementation for now */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ATTENDEE_PROPERTY:</div><div class='del'>-			tmpStr = icalproperty_get_attendee (prop);</div><div class='del'>-			person  = parse_person (prop, tmpStr);</div><div class='del'>-			ical-&gt;attendee = g_list_prepend (ical-&gt;attendee, </div><div class='del'>-							 person);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CONTACT_PROPERTY:</div><div class='del'>-			tmpStr = icalproperty_get_contact (prop);</div><div class='del'>-			person  = parse_person (prop, tmpStr);</div><div class='del'>-			ical-&gt;contact = g_list_prepend (ical-&gt;contact, person);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ORGANIZER_PROPERTY:</div><div class='del'>-			tmpStr = icalproperty_get_organizer (prop);</div><div class='del'>-			person  = parse_person (prop, tmpStr);</div><div class='del'>-			if (ical-&gt;organizer)</div><div class='del'>-				g_free (ical-&gt;organizer);</div><div class='del'>-			ical-&gt;organizer = person;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_RECURRENCEID_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_recurrenceid (prop);</div><div class='del'>-			ical-&gt;recurid = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			/* FIXME: Range parameter not implemented */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_RELATEDTO_PROPERTY:</div><div class='del'>-			ical-&gt;related = g_list_prepend (ical-&gt;related,</div><div class='del'>-							parse_related (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_URL_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;url, </div><div class='del'>-				  icalproperty_get_url (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_UID_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;uid,</div><div class='del'>-				  icalproperty_get_uid (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_EXDATE_PROPERTY:</div><div class='del'>-			/* FIXME: This does not appear to parse</div><div class='del'>-                           multiple exdate values in one property, as</div><div class='del'>-                           allowed by the RFC; needs a libical fix */</div><div class='del'>-			ictime = icalproperty_get_exdate (prop);</div><div class='del'>-			pt = g_new0 (time_t, 1);</div><div class='del'>-			*pt = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			ical-&gt;exdate = g_list_prepend (ical-&gt;exdate, pt);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_EXRULE_PROPERTY:</div><div class='del'>-		case ICAL_RDATE_PROPERTY:</div><div class='del'>-		case ICAL_RRULE_PROPERTY:</div><div class='del'>-			/* FIXME: need recursion processing */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ACTION_PROPERTY:</div><div class='del'>-		case ICAL_REPEAT_PROPERTY:</div><div class='del'>-		case ICAL_TRIGGER_PROPERTY:</div><div class='del'>-			/* should only occur in VALARM's, handled below */</div><div class='del'>-			g_assert_not_reached();</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CREATED_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_created (prop);</div><div class='del'>-			ical-&gt;created = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DTSTAMP_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_dtstamp (prop);</div><div class='del'>-			ical-&gt;dtstamp = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_LASTMODIFIED_PROPERTY:</div><div class='del'>-			ictime = icalproperty_get_lastmodified (prop);</div><div class='del'>-			ical-&gt;last_mod = icaltime_to_timet (&amp;ictime);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_SEQUENCE_PROPERTY:</div><div class='del'>-			ical-&gt;seq = icalproperty_get_sequence (prop);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_REQUESTSTATUS_PROPERTY:</div><div class='del'>-			copy_str (&amp;ical-&gt;rstatus,</div><div class='del'>-				  icalproperty_get_requeststatus (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_X_PROPERTY:</div><div class='del'>-			g_warning ("Unsupported X-property: %s",</div><div class='del'>-				   icalproperty_as_ical_string (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_XLICERROR_PROPERTY:</div><div class='del'>-			g_warning ("Unsupported property: %s",</div><div class='del'>-				   icalproperty_get_xlicerror (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PRODID_PROPERTY:</div><div class='del'>-		case ICAL_VERSION_PROPERTY:</div><div class='del'>-			/* nothing to do for this property */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_warning ("Unsupported property: %s", icalproperty_as_ical_string </div><div class='del'>-(prop));</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		prop = icalcomponent_get_next_property (comp,</div><div class='del'>-							ICAL_ANY_PROPERTY);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* now parse subcomponents --- should only be VALARM's */</div><div class='del'>-	subcomp = icalcomponent_get_first_component (comp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		compType = icalcomponent_isa (subcomp);</div><div class='del'>-		switch (compType) {</div><div class='del'>-		case ICAL_VALARM_COMPONENT:</div><div class='del'>-			alarm = parse_alarm (subcomp);</div><div class='del'>-			if (alarm)</div><div class='del'>-				ical-&gt;alarms = g_list_prepend (ical-&gt;alarms,</div><div class='del'>-							       alarm);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_warning ("Only nested VALARM components are supported.");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		subcomp = icalcomponent_get_next_component (comp,</div><div class='del'>-							    ICAL_ANY_COMPONENT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ical;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static time_t icaltime_to_timet (struct icaltimetype* i)</div><div class='del'>-{</div><div class='del'>-	struct tm t;</div><div class='del'>-	time_t ret;</div><div class='del'>-</div><div class='del'>-	t.tm_year = i-&gt;year - 1900;</div><div class='del'>-	t.tm_mon  = i-&gt;month - 1;</div><div class='del'>-	t.tm_mday = i-&gt;day;</div><div class='del'>-	if (!i-&gt;is_date) {</div><div class='del'>-		t.tm_hour = i-&gt;hour;</div><div class='del'>-		t.tm_min  = i-&gt;minute;</div><div class='del'>-		t.tm_sec  = i-&gt;second;</div><div class='del'>-	} else {</div><div class='del'>-		t.tm_hour = 0;</div><div class='del'>-		t.tm_min  = 0;</div><div class='del'>-		t.tm_sec  = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = mktime(&amp;t);</div><div class='del'>-</div><div class='del'>-	if (i-&gt;is_utc) {</div><div class='del'>-#ifdef HAVE_TIMEZONE</div><div class='del'>-	  	extern long timezone;</div><div class='del'>-		ret -= timezone;</div><div class='del'>-#else</div><div class='del'>-		struct tm *tmp;</div><div class='del'>-		time_t tod = time(NULL);</div><div class='del'>-		tmp = localtime (&amp;tod);</div><div class='del'>-		ret += tmp-&gt;tm_gmtoff;</div><div class='del'>-#endif</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 iCalPerson*</div><div class='del'>-parse_person (icalproperty* prop, gchar* value)</div><div class='del'>-{</div><div class='del'>-	icalparameter* param;</div><div class='del'>-	icalparameter_role role;</div><div class='del'>-	icalparameter_partstat partstat;</div><div class='del'>-	icalparameter_cutype cutype;</div><div class='del'>-</div><div class='del'>-	iCalPerson* ret;</div><div class='del'>-	</div><div class='del'>-	ret = g_new0 (iCalPerson, 1);</div><div class='del'>-</div><div class='del'>-	ret-&gt;addr = g_strdup (value);</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop,</div><div class='del'>-						  ICAL_CN_PARAMETER);</div><div class='del'>-	if (param)</div><div class='del'>-		ret-&gt;name = g_strdup (icalparameter_get_cn (param));</div><div class='del'>-	else</div><div class='del'>-		ret-&gt;name = NULL;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	param = icalproperty_get_first_parameter (prop,</div><div class='del'>-						  ICAL_ROLE_PARAMETER);</div><div class='del'>-	if (param) {</div><div class='del'>-		role  = icalparameter_get_role (param);</div><div class='del'>-		switch (role) {</div><div class='del'>-		case ICAL_ROLE_CHAIR:</div><div class='del'>-			ret-&gt;role = g_strdup ("CHAIR");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ROLE_REQPARTICIPANT:</div><div class='del'>-			ret-&gt;role = g_strdup ("REQPARTICIPANT");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ROLE_OPTPARTICIPANT:</div><div class='del'>-			ret-&gt;role = g_strdup ("OPTPARTICIPANT");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ROLE_NONPARTICIPANT:</div><div class='del'>-			ret-&gt;role = g_strdup ("NONPARTICIPANT");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ROLE_XNAME:</div><div class='del'>-		default:</div><div class='del'>-			ret-&gt;role = g_strdup ("UNKNOWN");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		ret-&gt;role = g_strdup ("REQPARTICIPANT");</div><div class='del'>-	</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);</div><div class='del'>-	if (param) {</div><div class='del'>-		partstat = icalparameter_get_partstat (param);</div><div class='del'>-		switch (partstat) {</div><div class='del'>-		case ICAL_PARTSTAT_NEEDSACTION:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("NEEDSACTION");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_ACCEPTED:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("ACCEPTED");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_DECLINED:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("DECLINED");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_TENTATIVE:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("TENTATIVE");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_DELEGATED:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("DELEGATED");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_COMPLETED:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("COMPLETED");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_INPROCESS:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("INPROCESS");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_PARTSTAT_XNAME:</div><div class='del'>-			ret-&gt;partstat = g_strdup (icalparameter_get_xvalue (param));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret-&gt;partstat = g_strdup ("UNKNOWN");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		ret-&gt;partstat = g_strdup ("NEEDSACTION");</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);</div><div class='del'>-	if (param)</div><div class='del'>-		ret-&gt;rsvp = icalparameter_get_rsvp (param);</div><div class='del'>-	else</div><div class='del'>-		ret-&gt;rsvp = FALSE;</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_CUTYPE_PARAMETER</div><div class='del'>-);</div><div class='del'>-	if (param) {</div><div class='del'>-		cutype = icalparameter_get_cutype (param);</div><div class='del'>-		switch (cutype) {</div><div class='del'>-		case ICAL_CUTYPE_INDIVIDUAL:</div><div class='del'>-			ret-&gt;cutype = g_strdup ("INDIVIDUAL");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CUTYPE_GROUP:</div><div class='del'>-			ret-&gt;cutype = g_strdup ("GROUP");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CUTYPE_RESOURCE:</div><div class='del'>-			ret-&gt;cutype = g_strdup ("RESOURCE");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CUTYPE_ROOM:</div><div class='del'>-			ret-&gt;cutype = g_strdup ("ROOM");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_CUTYPE_UNKNOWN:</div><div class='del'>-		case ICAL_CUTYPE_XNAME:</div><div class='del'>-		default:</div><div class='del'>-			ret-&gt;cutype = g_strdup ("UNKNOWN");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else </div><div class='del'>-		ret-&gt;cutype = g_strdup ("INDIVIDUAL");</div><div class='del'>-	</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_MEMBER_PARAMETER</div><div class='del'>-);</div><div class='del'>-	while (param) {</div><div class='del'>-		copy_to_list (&amp;ret-&gt;member, icalparameter_get_member (param));</div><div class='del'>-		param = icalproperty_get_next_parameter (prop, </div><div class='del'>-							 ICAL_MEMBER_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDTO_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		copy_to_list (&amp;ret-&gt;deleg_to, </div><div class='del'>-			      icalparameter_get_delegatedto (param));</div><div class='del'>-		param = icalproperty_get_next_parameter (prop,</div><div class='del'>-							 ICAL_DELEGATEDTO_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		copy_to_list (&amp;ret-&gt;deleg_from, </div><div class='del'>-			      icalparameter_get_delegatedfrom (param));</div><div class='del'>-		param = icalproperty_get_next_parameter (prop,</div><div class='del'>-							 ICAL_DELEGATEDFROM_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);</div><div class='del'>-	if (param)</div><div class='del'>-		copy_str (&amp;ret-&gt;sent_by, icalparameter_get_sentby (param));</div><div class='del'>-	else</div><div class='del'>-		ret-&gt;sent_by = NULL;</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_DIR_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		copy_to_list (&amp;ret-&gt;deleg_to, </div><div class='del'>-			      icalparameter_get_delegatedto (param));</div><div class='del'>-		param = icalproperty_get_next_parameter (prop,</div><div class='del'>-							 ICAL_DIR_PARAMETER);</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 iCalRelation* </div><div class='del'>-parse_related (icalproperty* prop)</div><div class='del'>-{</div><div class='del'>-	iCalRelation* rel;</div><div class='del'>-	icalparameter* param;</div><div class='del'>-	icalparameter_reltype type;</div><div class='del'>-</div><div class='del'>-	rel = g_new0 (iCalRelation, 1);</div><div class='del'>-	rel-&gt;uid = g_strdup (icalproperty_get_relatedto (prop));</div><div class='del'>-	</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, </div><div class='del'>-						  ICAL_RELTYPE_PARAMETER);</div><div class='del'>-	if (param) {</div><div class='del'>-		type = icalparameter_get_reltype (param);</div><div class='del'>-		switch (type) {</div><div class='del'>-		case ICAL_RELTYPE_PARENT:</div><div class='del'>-			rel-&gt;reltype = g_strdup ("PARENT");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_RELTYPE_CHILD:</div><div class='del'>-			rel-&gt;reltype = g_strdup ("CHILD");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_RELTYPE_SIBLING:</div><div class='del'>-			rel-&gt;reltype = g_strdup ("SIBLING");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_RELTYPE_XNAME:</div><div class='del'>-			rel-&gt;reltype = g_strdup (icalparameter_get_xvalue (param));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rel-&gt;reltype = g_strdup ("UNKNOWN");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		rel-&gt;reltype = g_strdup ("PARENT");</div><div class='del'>-</div><div class='del'>-	return rel;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-#ifdef TEST</div><div class='del'>-</div><div class='del'>-int main(int argc, char* argv[])</div><div class='del'>-{</div><div class='del'>-	icalcomponent* comp;</div><div class='del'>-	comp = icalendar_parse_file (argv[1]);</div><div class='del'>-	printf ("%s\n", icalcomponent_as_ical_string (comp));</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'>-	</div><div class='del'>-static CalendarAlarm*</div><div class='del'>-parse_alarm (icalcomponent* comp)</div><div class='del'>-{</div><div class='del'>-	CalendarAlarm *alarm;</div><div class='del'>-	icalproperty  *prop;</div><div class='del'>-	char          *tmpStr;</div><div class='del'>-	struct icaldurationtype dur;</div><div class='del'>-	struct icalattachtype attach;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	alarm = g_new0 (CalendarAlarm, 1);</div><div class='del'>-	</div><div class='del'>-	prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);</div><div class='del'>-	while (prop) {</div><div class='del'>-		switch (icalproperty_isa (prop)) {</div><div class='del'>-		case ICAL_ACTION_PROPERTY:</div><div class='del'>-			tmpStr = icalproperty_get_action (prop);</div><div class='del'>-			if (!g_strcasecmp (tmpStr, "AUDIO"))</div><div class='del'>-				alarm-&gt;type = ALARM_AUDIO;</div><div class='del'>-			else if (!g_strcasecmp (tmpStr, "DISPLAY"))</div><div class='del'>-				alarm-&gt;type = ALARM_DISPLAY;</div><div class='del'>-			else if (!g_strcasecmp (tmpStr, "EMAIL"))</div><div class='del'>-				alarm-&gt;type = ALARM_MAIL;</div><div class='del'>-			else if (!g_strcasecmp (tmpStr, "PROCEDURE"))</div><div class='del'>-				alarm-&gt;type = ALARM_PROGRAM;</div><div class='del'>-			else</div><div class='del'>-				g_warning ("Unsupported alarm type!");</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_TRIGGER_PROPERTY:</div><div class='del'>-			/* FIXME: waiting on proper libical support */</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_REPEAT_PROPERTY:</div><div class='del'>-			alarm-&gt;snooze_repeat = icalproperty_get_repeat (prop);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DURATION_PROPERTY:</div><div class='del'>-			dur = icalproperty_get_duration (prop);</div><div class='del'>-			alarm-&gt;snooze_secs = icaldurationtype_as_timet (dur);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ATTACH_PROPERTY:</div><div class='del'>-			attach = icalproperty_get_attach (prop);</div><div class='del'>-			copy_str (&amp;alarm-&gt;attach,</div><div class='del'>-				  icalattachtype_get_url (&amp;attach));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_DESCRIPTION_PROPERTY:</div><div class='del'>-			copy_str (&amp;alarm-&gt;desc,</div><div class='del'>-				  icalproperty_get_description (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_SUMMARY_PROPERTY:</div><div class='del'>-			copy_str (&amp;alarm-&gt;summary,</div><div class='del'>-				  icalproperty_get_summary (prop));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_ATTENDEE_PROPERTY:</div><div class='del'>-			copy_str (&amp;alarm-&gt;attendee,</div><div class='del'>-				  icalproperty_get_attendee (prop));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_warning ("Unsupported alarm property: %s",</div><div class='del'>-				   icalproperty_as_ical_string (prop));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		prop = icalcomponent_get_next_property (comp, </div><div class='del'>-							ICAL_ANY_PROPERTY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return alarm;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/icalendar.h b/calendar/cal-util/icalendar.h<br/>deleted file mode 100644<br/>index 2a22fbab71..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/icalendar.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/icalendar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-#ifndef ICALENDAR_H</div><div class='del'>-#define ICALENDAR_H</div><div class='del'>-</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-iCalObject *ical_object_create_from_icalcomponent (icalcomponent* comp);</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/cal-util/test-recur.c b/calendar/cal-util/test-recur.c<br/>deleted file mode 100644<br/>index 83602bb0d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/test-recur.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/test-recur.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,337 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Helix Code, 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 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'>-/*</div><div class='del'>- * This tests the recurrence rule expansion functions.</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;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "cal-recur.h"</div><div class='del'>-</div><div class='del'>-static void set_time (CalObjTime *cotime, gint year, gint month, gint day,</div><div class='del'>-		      gint hour, gint minute, gint second);</div><div class='del'>-static void display_occs (GArray *occs);</div><div class='del'>-static GList* build_list (gint first, ...);</div><div class='del'>-static gchar* time_to_string (CalObjTime *cotime);</div><div class='del'>-static void do_test (gchar		  *description,</div><div class='del'>-		     CalObjTime	  *event_start,</div><div class='del'>-		     CalObjRecurrence *recur,</div><div class='del'>-		     CalObjTime	  *interval_start,</div><div class='del'>-		     CalObjTime	  *interval_end);</div><div class='del'>-</div><div class='del'>-#define LIST_END	999</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_yearly ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2010, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_YEARLY;</div><div class='del'>-	recur.interval = 3;</div><div class='del'>-	recur.byweekno = build_list (3, 9, 24, LIST_END);</div><div class='del'>-	recur.byday = build_list (3, 0, 5, 0, LIST_END);</div><div class='del'>-	do_test ("YEARLY every 3 years in weeks 3, 9, 24 on Thu/Sat",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	set_time (&amp;interval_end,   2002, 0, 1, 0, 0, 0);</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_YEARLY;</div><div class='del'>-	recur.interval = 1;</div><div class='del'>-	recur.bymonth = build_list (0, 6, LIST_END);</div><div class='del'>-	recur.byday = build_list (0, 0, 6, 0, LIST_END);</div><div class='del'>-	do_test ("YEARLY every year in Jan/Jul on Mon/Sun",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_YEARLY;</div><div class='del'>-	recur.interval = 1;</div><div class='del'>-	recur.bymonthday = build_list (3, 7, LIST_END);</div><div class='del'>-	do_test ("YEARLY every year on 3rd &amp; 7th of the month",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_YEARLY;</div><div class='del'>-	recur.interval = 1;</div><div class='del'>-	recur.byyearday = build_list (15, 126, 360, LIST_END);</div><div class='del'>-	do_test ("YEARLY every year on 15th, 126th &amp; 360th day of the year",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</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'>-test_monthly ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2002, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_MONTHLY;</div><div class='del'>-	recur.interval = 1;</div><div class='del'>-	do_test ("MONTHLY every month",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_weekly ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2002, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_WEEKLY;</div><div class='del'>-	recur.interval = 1;</div><div class='del'>-	do_test ("WEEKLY every week",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_daily ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2000, 6, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_DAILY;</div><div class='del'>-	recur.interval = 1;</div><div class='del'>-	do_test ("DAILY every day",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_hourly ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 2, 15, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2002, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_HOURLY;</div><div class='del'>-	recur.interval = 3;</div><div class='del'>-	recur.bymonth = build_list (3, 11, LIST_END);</div><div class='del'>-	recur.byday = build_list (2, 0, 4, 0, LIST_END);</div><div class='del'>-	do_test ("HOURLY every 3 hours in Apr/Dec on Wed &amp; Fri",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_minutely ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2000, 0, 2, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_MINUTELY;</div><div class='del'>-	recur.interval = 45;</div><div class='del'>-	do_test ("MINUTELY every 45 minutes",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_secondly ()</div><div class='del'>-{</div><div class='del'>-	CalObjTime event_start, interval_start, interval_end;</div><div class='del'>-	CalObjRecurrence recur;</div><div class='del'>-</div><div class='del'>-	set_time (&amp;event_start,    2000, 0, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* We set the interval to a wide range so we just test the event. */</div><div class='del'>-	set_time (&amp;interval_start, 2000, 0, 1, 0, 0, 0);</div><div class='del'>-	set_time (&amp;interval_end,   2000, 0, 2, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;recur, 0, sizeof (recur));</div><div class='del'>-	recur.type = CAL_RECUR_SECONDLY;</div><div class='del'>-	recur.interval = 15;</div><div class='del'>-	recur.byhour = build_list (2, 4, 6, LIST_END);</div><div class='del'>-	recur.byminute = build_list (0, 30, LIST_END);</div><div class='del'>-	do_test ("SECONDLY every 15 seconds at 2:00,2:30,4:00,4:30,6:00,6:30",</div><div class='del'>-		 &amp;event_start, &amp;recur, &amp;interval_start, &amp;interval_end);</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'>-	test_yearly ();</div><div class='del'>-	test_monthly ();</div><div class='del'>-	test_weekly ();</div><div class='del'>-	test_daily ();</div><div class='del'>-	test_hourly ();</div><div class='del'>-	test_minutely ();</div><div class='del'>-	test_secondly ();</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'>-set_time (CalObjTime *cotime, gint year, gint month, gint day,</div><div class='del'>-	  gint hour, gint minute, gint second)</div><div class='del'>-{</div><div class='del'>-	cotime-&gt;year	= year;</div><div class='del'>-	cotime-&gt;month	= month;</div><div class='del'>-	cotime-&gt;day	= day;</div><div class='del'>-	cotime-&gt;hour	= hour;</div><div class='del'>-	cotime-&gt;minute	= minute;</div><div class='del'>-	cotime-&gt;second	= second;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GList*</div><div class='del'>-build_list (gint first, ...)</div><div class='del'>-{</div><div class='del'>-  va_list args;</div><div class='del'>-  GList *list;</div><div class='del'>-  gint num;</div><div class='del'>-</div><div class='del'>-  va_start (args, first);</div><div class='del'>-</div><div class='del'>-  list = g_list_prepend (NULL, GINT_TO_POINTER (first));</div><div class='del'>-</div><div class='del'>-  num = va_arg (args, gint);</div><div class='del'>-  while (num != LIST_END) {</div><div class='del'>-	  list = g_list_prepend (list, GINT_TO_POINTER (num));</div><div class='del'>-	  num = va_arg (args, gint);</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'>-  va_end (args);</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 void</div><div class='del'>-do_test (gchar		  *description,</div><div class='del'>-	 CalObjTime	  *event_start,</div><div class='del'>-	 CalObjRecurrence *recur,</div><div class='del'>-	 CalObjTime	  *interval_start,</div><div class='del'>-	 CalObjTime	  *interval_end)</div><div class='del'>-{</div><div class='del'>-	GArray *occs;</div><div class='del'>-</div><div class='del'>-	g_print ("========================================================\n");</div><div class='del'>-	g_print ("%s\n", description);</div><div class='del'>-	g_print ("(From %s", time_to_string (interval_start));</div><div class='del'>-	g_print (" To %s)\n\n", time_to_string (interval_end));</div><div class='del'>-</div><div class='del'>-	occs = cal_obj_expand_recurrence (event_start, recur,</div><div class='del'>-					  interval_start, interval_end);</div><div class='del'>-	display_occs (occs);</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gchar*</div><div class='del'>-time_to_string (CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	static gchar buffer[64];</div><div class='del'>-	gint month;</div><div class='del'>-	gchar *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", </div><div class='del'>-			    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "XXX" };</div><div class='del'>-</div><div class='del'>-	month = cotime-&gt;month;</div><div class='del'>-	if (month &lt; 0 || month &gt; 12)</div><div class='del'>-		month = 12;</div><div class='del'>-</div><div class='del'>-	sprintf (buffer, "%s %2i %02i:%02i:%02i %4i",</div><div class='del'>-		 months[month], cotime-&gt;day,</div><div class='del'>-		 cotime-&gt;hour, cotime-&gt;minute, cotime-&gt;second,</div><div class='del'>-		 cotime-&gt;year);</div><div class='del'>-</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-display_occs (GArray *occs)</div><div class='del'>-{</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i;</div><div class='del'>-	struct tm t;</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'>-		t.tm_sec	= occ-&gt;second;</div><div class='del'>-		t.tm_min	= occ-&gt;minute;</div><div class='del'>-		t.tm_hour	= occ-&gt;hour;</div><div class='del'>-		t.tm_mday	= occ-&gt;day;</div><div class='del'>-		t.tm_mon	= occ-&gt;month;</div><div class='del'>-		t.tm_year	= occ-&gt;year - 1900;</div><div class='del'>-		t.tm_isdst	= -1;</div><div class='del'>-</div><div class='del'>-		mktime (&amp;t);</div><div class='del'>-</div><div class='del'>-		g_print ("%s", asctime (&amp;t));</div><div class='del'>-	}</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 f887a8df37..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/timeutil.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/timeutil.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,557 +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'>- *</div><div class='del'>- * Authors: Federico Mena &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/libgnome.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "timeutil.h"</div><div class='del'>-</div><div class='del'>-#define digit_at(x,y) (x [y] - '0')</div><div class='del'>-	</div><div class='del'>-time_t</div><div class='del'>-time_from_isodate (char *str)</div><div class='del'>-{</div><div class='del'>-	struct tm my_tm;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	if (strlen (str) &lt; 14)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	my_tm.tm_year = (digit_at (str, 0) * 1000 + digit_at (str, 1) * 100 +</div><div class='del'>-		digit_at (str, 2) * 10 + digit_at (str, 3)) - 1900;</div><div class='del'>-</div><div class='del'>-	my_tm.tm_mon  = digit_at (str, 4) * 10 + digit_at (str, 5) - 1;</div><div class='del'>-	my_tm.tm_mday = digit_at (str, 6) * 10 + digit_at (str, 7);</div><div class='del'>-	my_tm.tm_hour = digit_at (str, 9) * 10 + digit_at (str, 10);</div><div class='del'>-	my_tm.tm_min  = digit_at (str, 11) * 10 + digit_at (str, 12);</div><div class='del'>-	my_tm.tm_sec  = digit_at (str, 13) * 10 + digit_at (str, 14);</div><div class='del'>-	my_tm.tm_isdst = -1;</div><div class='del'>-	</div><div class='del'>-	t = mktime (&amp;my_tm);</div><div class='del'>-</div><div class='del'>-	if (str [15] == 'Z')</div><div class='del'>-#if defined(HAVE_TM_GMTOFF)</div><div class='del'>-		t -= my_tm.tm_gmtoff</div><div class='del'>-#elsif defined(HAVE_TIMEZONE)</div><div class='del'>-		t -= timezone</div><div class='del'>-#endif</div><div class='del'>-		;</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'>-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 ("TIEMPO: %d/%d/%d %d:%d:%d\n",</div><div class='del'>-		tm-&gt;tm_mon+1, tm-&gt;tm_mday, tm-&gt;tm_year,</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'>-int</div><div class='del'>-get_time_t_hour (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'>-	return tm-&gt;tm_hour;</div><div class='del'>-}</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'>-	static char isotime [40];</div><div class='del'>-</div><div class='del'>-	tm = localtime (&amp;t);</div><div class='del'>-	strftime (isotime, sizeof (isotime)-1, "%Y%m%dT%H%M%S", tm);</div><div class='del'>-	return isotime;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-time_from_start_duration (time_t start, char *duration)</div><div class='del'>-{</div><div class='del'>-	printf ("Not yet implemented\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-format_simple_hour (int hour, int use_am_pm)</div><div class='del'>-{</div><div class='del'>-	static char buf[256];</div><div class='del'>-</div><div class='del'>-	/* I don't know whether this is the best way to internationalize it.</div><div class='del'>-	 * Does any language use different conventions? - Federico</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (use_am_pm)</div><div class='del'>-		g_snprintf (buf, sizeof(buf), "%d%s",</div><div class='del'>-			 (hour == 0) ? 12 : (hour &gt; 12) ? (hour - 12) : hour,</div><div class='del'>-			 (hour &lt; 12) ? _("am") : _("pm"));</div><div class='del'>-	else</div><div class='del'>-		g_snprintf (buf, sizeof(buf), "%02d%s", hour, _("h"));</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-time_add_minutes (time_t time, int minutes)</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_min += minutes;</div><div class='del'>-	if ((new_time = mktime (tm)) == -1){</div><div class='del'>-		g_message ("time_add_minutes(): mktime() could not handle "</div><div class='del'>-			   "adding %d minutes with\n", minutes);</div><div class='del'>-		print_time_t (time);</div><div class='del'>-		return time;</div><div class='del'>-	}</div><div class='del'>-	return new_time;</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'>-#if 0</div><div class='del'>-	int dst_flag = tm-&gt;tm_isdst;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	tm-&gt;tm_mday += days;</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'>-		return time;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* I don't know what this is for. See also time_day_begin() and</div><div class='del'>-	   time_day_end(). - Damon. */</div><div class='del'>-	if (dst_flag &gt; tm-&gt;tm_isdst){</div><div class='del'>-		tm-&gt;tm_hour++;</div><div class='del'>-		new_time += 3600;</div><div class='del'>-	} else if (dst_flag &lt; tm-&gt;tm_isdst){</div><div class='del'>-		tm-&gt;tm_hour--;</div><div class='del'>-		new_time -= 3600;</div><div class='del'>-	}</div><div class='del'>-#endif</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'>-time_t</div><div class='del'>-time_add_month (time_t time, int months)</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'>-	int mday;</div><div class='del'>-</div><div class='del'>-	mday = tm-&gt;tm_mday;</div><div class='del'>-	</div><div class='del'>-	tm-&gt;tm_mon += months;</div><div class='del'>-	tm-&gt;tm_isdst = -1;</div><div class='del'>-	if ((new_time = mktime (tm)) == -1){</div><div class='del'>-		g_message ("time_add_month(): mktime() could not handling adding %d months with\n",</div><div class='del'>-			   months);</div><div class='del'>-		print_time_t (time);</div><div class='del'>-		return time;</div><div class='del'>-	}</div><div class='del'>-	tm = localtime (&amp;new_time);</div><div class='del'>-	if (tm-&gt;tm_mday &lt; mday){</div><div class='del'>-		tm-&gt;tm_mon--;</div><div class='del'>-		tm-&gt;tm_mday = time_days_in_month (tm-&gt;tm_year+1900, tm-&gt;tm_mon);</div><div class='del'>-		return new_time = mktime (tm);</div><div class='del'>-	}</div><div class='del'>-	else</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_year (time_t time, int years)</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_year += years;</div><div class='del'>-	if ((new_time = mktime (tm)) == -1){</div><div class='del'>-		g_message ("time_add_year(): mktime() could not handling adding %d years with\n",</div><div class='del'>-			   years);</div><div class='del'>-		print_time_t (time);</div><div class='del'>-		return time;</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_day_hour (time_t t, int hour)</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 = hour;</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-</div><div class='del'>-	return mktime (&amp;tm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Number of days in a month, for normal and leap years */</div><div class='del'>-static const int days_in_month[2][12] = {</div><div class='del'>-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },</div><div class='del'>-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified year is a leap year */</div><div class='del'>-static int</div><div class='del'>-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'>-int</div><div class='del'>-time_days_in_month (int year, int month)</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'>-	return days_in_month [is_leap_year (year)][month];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-time_from_day (int year, int month, int day)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	memset (&amp;tm, 0, sizeof (tm));</div><div class='del'>-	tm.tm_year = year - 1900;</div><div class='del'>-	tm.tm_mon = month;</div><div class='del'>-	tm.tm_mday = day;</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'>-time_t</div><div class='del'>-time_year_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_mon  = 0;</div><div class='del'>-	tm.tm_mday = 1;</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'>-time_t</div><div class='del'>-time_year_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_hour = 0;</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	tm.tm_mon  = 0;</div><div class='del'>-	tm.tm_mday = 1;</div><div class='del'>-	tm.tm_year++;</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'>-time_t</div><div class='del'>-time_month_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_mday = 1;</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'>-time_t</div><div class='del'>-time_month_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_hour = 0;</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	tm.tm_mday = 1;</div><div class='del'>-	tm.tm_mon++;</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'>-time_t</div><div class='del'>-time_week_begin (time_t t)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	/* FIXME: make it take week_starts_on_monday into account */</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_mday -= tm.tm_wday;</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'>-time_t</div><div class='del'>-time_week_end (time_t t)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	/* FIXME: make it take week_starts_on_monday into account */</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_mday += 7 - tm.tm_wday;</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 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'>-#if 1</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'>-#else</div><div class='del'>-	/* This is the original code which sometimes produces a time of 1:00.</div><div class='del'>-	   I don't understand why it looked at the tm_isdst flags at all.</div><div class='del'>-	   - Damon. */</div><div class='del'>-</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t temp = t - 43200;</div><div class='del'>-	int dstflag, dstflag2;</div><div class='del'>-	</div><div class='del'>-	tm = *localtime(&amp;temp); /* one day */</div><div class='del'>-	dstflag = tm.tm_isdst;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-	dstflag2 = tm.tm_isdst;</div><div class='del'>-</div><div class='del'>-	if (dstflag &lt; dstflag2)</div><div class='del'>-		tm.tm_hour = 1;</div><div class='del'>-	else</div><div class='del'>-		tm.tm_hour = 0;</div><div class='del'>-</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	</div><div class='del'>-	temp = mktime(&amp;tm);</div><div class='del'>-	if (dstflag &gt; dstflag2){</div><div class='del'>-		temp += 3600; </div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return temp;</div><div class='del'>-#endif</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'>-#if 1</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'>-#else</div><div class='del'>-	/* This is the original code which has more problems than</div><div class='del'>-	   time_day_begin(). - Damon. */</div><div class='del'>-</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t temp;</div><div class='del'>-	int dstflag, dstflag2;</div><div class='del'>-</div><div class='del'>-	t += 10800;</div><div class='del'>-	temp = t - 86400;</div><div class='del'>-</div><div class='del'>-	tm = *localtime(&amp;temp); /* one day */</div><div class='del'>-	dstflag = tm.tm_isdst;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-	dstflag2 = tm.tm_isdst;</div><div class='del'>-</div><div class='del'>-	if (dstflag &lt; dstflag2)</div><div class='del'>-		tm.tm_hour = 23;</div><div class='del'>-	else {</div><div class='del'>-		tm.tm_mday++;</div><div class='del'>-		tm.tm_hour = 0;</div><div class='del'>-	}</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	</div><div class='del'>-	temp = mktime(&amp;tm);</div><div class='del'>-	if(dstflag &gt; dstflag2) {</div><div class='del'>-	}</div><div class='del'>-	return temp;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pcat (char *dest, int num, char key)</div><div class='del'>-{</div><div class='del'>-	int c;</div><div class='del'>-</div><div class='del'>-	c = sprintf (dest, "%d%c", num, key);</div><div class='del'>-	return dest + c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts secs into the ISO difftime representation */</div><div class='del'>-char *</div><div class='del'>-isodiff_from_secs (int secs)</div><div class='del'>-{</div><div class='del'>-	static char buffer [60], *p;</div><div class='del'>-	int years, months, weeks, days, hours, minutes;</div><div class='del'>-	</div><div class='del'>-	years = months = weeks = days = hours = minutes = 0;</div><div class='del'>-	</div><div class='del'>-	years    = secs / (365 * 86400);</div><div class='del'>-	secs    %= (365 * 86400);</div><div class='del'>-	months   = secs / (30 * 86400);</div><div class='del'>-	secs    %= (30 * 86400);</div><div class='del'>-	weeks    = secs / (7 * 86400);</div><div class='del'>-	secs    %= (7 * 86400);</div><div class='del'>-	days     = secs / 86400;</div><div class='del'>-	secs    %= 86400;</div><div class='del'>-	hours    = secs / 3600;</div><div class='del'>-	secs    %= 3600;</div><div class='del'>-	minutes  = secs / 60;</div><div class='del'>-	secs    %= 60;</div><div class='del'>-</div><div class='del'>-	strcpy (buffer, "P");</div><div class='del'>-	p = buffer + 1;</div><div class='del'>-	if (years)</div><div class='del'>-		p = pcat (p, years, 'Y');</div><div class='del'>-	if (months)</div><div class='del'>-		p = pcat (p, months, 'M');</div><div class='del'>-	if (weeks)</div><div class='del'>-		p = pcat (p, weeks, 'W');</div><div class='del'>-	if (days)</div><div class='del'>-		p = pcat (p, days, 'D');</div><div class='del'>-	if (hours || minutes || secs){</div><div class='del'>-		*p++ = 'T';</div><div class='del'>-		if (hours)</div><div class='del'>-			p = pcat (p, hours, 'H');</div><div class='del'>-		if (minutes)</div><div class='del'>-			p = pcat (p, minutes, 'M');</div><div class='del'>-		if (secs)</div><div class='del'>-			p = pcat (p, secs, 'S');</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'>-int</div><div class='del'>-isodiff_to_secs (char *str)</div><div class='del'>-{</div><div class='del'>-	int value, time;</div><div class='del'>-	int years, months, weeks, days, hours, minutes, seconds;</div><div class='del'>-</div><div class='del'>-	value = years = months = weeks = days = hours = minutes = time = seconds = 0;</div><div class='del'>-	if (*str != 'P')</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	str++;</div><div class='del'>-	while (*str){</div><div class='del'>-		switch (*str){</div><div class='del'>-		case '0': case '1': case '2': case '3': case '4':</div><div class='del'>-		case '5': case '6': case '7': case '8': case '9':</div><div class='del'>-			value = value * 10 + (*str - '0');</div><div class='del'>-			break;</div><div class='del'>-		case 'Y':</div><div class='del'>-			years = value; value = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 'M':</div><div class='del'>-			if (time)</div><div class='del'>-				minutes = value;</div><div class='del'>-			else</div><div class='del'>-				months = value;</div><div class='del'>-			value = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 'W':</div><div class='del'>-			weeks = value; value = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 'D':</div><div class='del'>-			days = value; value = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 'T':</div><div class='del'>-			value = 0; time = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 'H':</div><div class='del'>-			hours = value; value = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 'S':</div><div class='del'>-			seconds = value; value = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		str++;</div><div class='del'>-	}</div><div class='del'>-	return seconds + (minutes * 60) + (hours * 3600) +</div><div class='del'>-	       (days * 86400) + (weeks * 7 * 86400) +</div><div class='del'>-	       (months * 30 * 86400) + (years * 365 * 86400);</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 407213d7f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/timeutil.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/cal-util/timeutil.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +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'>- *</div><div class='del'>- * Authors: Federico Mena &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@nuclecu.unam.mx&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'>-</div><div class='del'>-</div><div class='del'>-time_t time_from_isodate        (char *str);</div><div class='del'>-time_t time_from_start_duration (time_t start, char *duration);</div><div class='del'>-char   *isodate_from_time_t     (time_t t);</div><div class='del'>-int    get_time_t_hour          (time_t t);</div><div class='del'>-int    isodiff_to_secs          (char *str);</div><div class='del'>-char   *isodiff_from_secs       (int secs);</div><div class='del'>-</div><div class='del'>-time_t time_add_minutes (time_t time, int minutes);</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'>-time_t time_add_month (time_t time, int months);</div><div class='del'>-time_t time_add_year (time_t time, int years);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns pointer to a statically-allocated buffer with a string of the form</div><div class='del'>- * 3am, 4am, 12pm, 08h, 17h, etc.</div><div class='del'>- * The string is internationalized, hopefully correctly.</div><div class='del'>- */</div><div class='del'>-char *format_simple_hour (int hour, int use_am_pm);</div><div class='del'>-</div><div class='del'>-/* Returns the number of days in the specified month.  Years are full years (starting from year 1).</div><div class='del'>- * Months are in [0, 11].</div><div class='del'>- */</div><div class='del'>-int time_days_in_month (int year, int month);</div><div class='del'>-</div><div class='del'>-/* Converts the specified date to a time_t at the start of the specified day.  Years are full years</div><div class='del'>- * (starting from year 1).  Months are in [0, 11].  Days are 1-based.</div><div class='del'>- */</div><div class='del'>-time_t time_from_day (int year, int month, int day);</div><div class='del'>-</div><div class='del'>-time_t time_day_hour     (time_t t, int hour);</div><div class='del'>-</div><div class='del'>-/* For the functions below, time ranges are considered to contain the start time, but not the end</div><div class='del'>- * time.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* These two functions take a time value and return the beginning or end of the corresponding year,</div><div class='del'>- * respectively.</div><div class='del'>- */</div><div class='del'>-time_t time_year_begin (time_t t);</div><div class='del'>-time_t time_year_end (time_t t);</div><div class='del'>-</div><div class='del'>-/* These two functions take a time value and return the beginning or end of the corresponding month,</div><div class='del'>- * respectively.</div><div class='del'>- */</div><div class='del'>-time_t time_month_begin (time_t t);</div><div class='del'>-time_t time_month_end (time_t t);</div><div class='del'>-</div><div class='del'>-/* These functions take a time value and return the beginning or end of the corresponding week,</div><div class='del'>- * respectively.  This takes into account the global week_starts_on_monday flag.</div><div class='del'>- */</div><div class='del'>-time_t time_week_begin (time_t t);</div><div class='del'>-time_t time_week_end (time_t t);</div><div class='del'>-</div><div class='del'>-/* These two functions take a time value and return the beginning or end of the corresponding day,</div><div class='del'>- * respectively.</div><div class='del'>- */</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'>-time_t parse_date (char *str);</div><div class='del'>-void print_time_t (time_t t);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.c b/calendar/conduits/calendar/calendar-conduit-control-applet.c<br/>deleted file mode 100644<br/>index 2d6fb60ef5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit-control-applet.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/calendar/calendar-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,360 +0,0 @@</div><div class='del'>-/* Control applet ("capplet") for the gnome-pilot calendar conduit,         */</div><div class='del'>-/* based on                                                                 */</div><div class='del'>-/* gpilotd control applet ('capplet') for use with the GNOME control center */</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;capplet-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gpilotd/gpilotd-conduit-mgmt.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app-dummy-callbacks.h&gt;</div><div class='del'>-</div><div class='del'>-#include "calendar-conduit.h"</div><div class='del'>-</div><div class='del'>-/* tell changes callbacks to ignore changes or not */</div><div class='del'>-static gboolean ignore_changes=FALSE;</div><div class='del'>-</div><div class='del'>-/* capplet widget */</div><div class='del'>-static GtkWidget *capplet=NULL;</div><div class='del'>-</div><div class='del'>-/* host/device/pilot configuration windows */</div><div class='del'>-GtkWidget *cfgOptionsWindow=NULL;</div><div class='del'>-GtkWidget *cfgStateWindow=NULL;</div><div class='del'>-GtkWidget *dialogWindow=NULL;</div><div class='del'>-</div><div class='del'>-GnomePilotConduitMgmt *conduit;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, gpointer);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, gpointer);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, gpointer);</div><div class='del'>-</div><div class='del'>-static void readStateCfg(GtkWidget *w,GCalConduitCfg *cfg);</div><div class='del'>-static void setStateCfg(GtkWidget *w,GCalConduitCfg *cfg);</div><div class='del'>-void about_cb (GtkWidget *, gpointer);</div><div class='del'>-GCalConduitCfg *origState = NULL;</div><div class='del'>-GCalConduitCfg *curState = NULL;</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-/* This array must be in the same order as enumerations</div><div class='del'>-   in GnomePilotConduitSyncType as they are used as index.</div><div class='del'>-   Custom type implies Disabled state.</div><div class='del'>-*/</div><div class='del'>-static gchar* sync_options[] ={ N_("Disabled"),</div><div class='del'>-				N_("Synchronize"),</div><div class='del'>-				N_("Copy From Pilot"),</div><div class='del'>-				N_("Copy To Pilot"),</div><div class='del'>-				N_("Merge From Pilot"),</div><div class='del'>-				N_("Merge To Pilot")};</div><div class='del'>-#define SYNC_OPTIONS_COUNT 6</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-setSettings(GCalConduitCfg* conduitCfg)</div><div class='del'>-{</div><div class='del'>-	if(conduitCfg-&gt;sync_type!=GnomePilotConduitSyncTypeCustom)</div><div class='del'>-		gpilotd_conduit_mgmt_enable_with_first_sync(conduit,pilotId,</div><div class='del'>-							    conduitCfg-&gt;sync_type,</div><div class='del'>-							    conduitCfg-&gt;sync_type,</div><div class='del'>-							    TRUE);</div><div class='del'>-	else</div><div class='del'>-		gpilotd_conduit_mgmt_disable(conduit,pilotId);</div><div class='del'>-</div><div class='del'>-	gcalconduit_save_configuration(conduitCfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doTrySettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	readStateCfg(cfgStateWindow,curState);</div><div class='del'>-	setSettings(curState);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	doTrySettings(widget,whatever);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doCancelSettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	setSettings(origState);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	gcalconduit_destroy_configuration(&amp;curState);</div><div class='del'>-	curState = gcalconduit_dupe_configuration(origState);</div><div class='del'>-	setStateCfg(cfgStateWindow,curState);</div><div class='del'>-	setSettings(curState);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_dir_callback (GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		     gint len, gint *position, void *data)</div><div class='del'>-{</div><div class='del'>-    gint i;</div><div class='del'>-    gchar *curname;</div><div class='del'>-</div><div class='del'>-    curname = gtk_entry_get_text(GTK_ENTRY(editable));</div><div class='del'>-    if (*curname == '\0' &amp;&amp; len &gt; 0) {</div><div class='del'>-	if (isspace(text[0])) {</div><div class='del'>-	    gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");</div><div class='del'>-	    return;</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='del'>-	    if (isspace(text[i])) {</div><div class='del'>-		gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), </div><div class='del'>-					     "insert_text");</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'>-insert_dir_callback2(GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		      gint            length, gint           *position,</div><div class='del'>-		      void *data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-        capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clist_changed(GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-	capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-void about_cb (GtkWidget *widget, gpointer data) {</div><div class='del'>-  GtkWidget *about;</div><div class='del'>-  const gchar *authors[] = {_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"),NULL};</div><div class='del'>-  </div><div class='del'>-  about = gnome_about_new(_("GnomeCalendar Conduit"), VERSION,</div><div class='del'>-			  _("(C) 1998"),</div><div class='del'>-			  authors,</div><div class='del'>-			  _("Configuration utility for the calendar conduit.\n"),</div><div class='del'>-			  _("gnome-calendar-conduit.png"));</div><div class='del'>-  gtk_widget_show (about);</div><div class='del'>-  </div><div class='del'>-  return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void toggled_cb(GtkWidget *widget, gpointer data) {</div><div class='del'>-  capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by the sync_type GtkOptionMenu */</div><div class='del'>-static void</div><div class='del'>-sync_action_selection(GtkMenuShell *widget, gpointer unused) </div><div class='del'>-{</div><div class='del'>-	if (!ignore_changes) {</div><div class='del'>-		capplet_widget_state_changed(CAPPLET_WIDGET (capplet), TRUE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by the sync_type GtkOptionMenu */</div><div class='del'>-static void</div><div class='del'>-activate_sync_type(GtkMenuItem *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	curState-&gt;sync_type = GPOINTER_TO_INT(data);</div><div class='del'>-	if(!ignore_changes)</div><div class='del'>-		capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget</div><div class='del'>-*createStateCfgWindow(void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vbox, *table;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *optionMenu,*menuItem;</div><div class='del'>-	GtkMenu   *menu;</div><div class='del'>-	gint i;</div><div class='del'>-	</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	table =  gtk_hbox_new(FALSE, 0); </div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new(_("Synchronize Action"));</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    </div><div class='del'>-</div><div class='del'>-	optionMenu=gtk_option_menu_new();</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);</div><div class='del'>-	menu = GTK_MENU(gtk_menu_new());</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;SYNC_OPTIONS_COUNT;i++) {</div><div class='del'>-		sync_options[i]=_(sync_options[i]);</div><div class='del'>-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);</div><div class='del'>-		gtk_widget_show(menuItem);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",</div><div class='del'>-				   GTK_SIGNAL_FUNC(activate_sync_type),</div><div class='del'>-				   GINT_TO_POINTER(i));</div><div class='del'>-		gtk_menu_append(menu,menuItem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(menu), "selection-done",</div><div class='del'>-			   GTK_SIGNAL_FUNC(sync_action_selection),</div><div class='del'>-			   NULL);</div><div class='del'>-  </div><div class='del'>-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    </div><div class='del'>-	</div><div class='del'>-	return vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg(GtkWidget *widget,GCalConduitCfg *cfg)</div><div class='del'>-{</div><div class='del'>-	GtkOptionMenu *optionMenu;</div><div class='del'>-	GtkMenu *menu;</div><div class='del'>-	</div><div class='del'>-	optionMenu = gtk_object_get_data(GTK_OBJECT(widget), "conduit_state");</div><div class='del'>-	g_assert(optionMenu!=NULL);</div><div class='del'>-	menu = GTK_MENU(gtk_option_menu_get_menu(optionMenu));</div><div class='del'>-</div><div class='del'>-  </div><div class='del'>-	ignore_changes = TRUE;</div><div class='del'>-	/* Here were are relying on the items in menu being the same </div><div class='del'>-	   order as in GnomePilotConduitSyncType. */</div><div class='del'>-	gtk_option_menu_set_history(optionMenu,(int)cfg-&gt;sync_type);</div><div class='del'>-	ignore_changes = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-readStateCfg(GtkWidget *w,GCalConduitCfg *cfg)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>-  GtkWidget *button;</div><div class='del'>-</div><div class='del'>-  button  = gtk_object_get_data(GTK_OBJECT(w), "conduit_on_off");</div><div class='del'>-  </div><div class='del'>-  g_assert(button!=NULL);</div><div class='del'>-</div><div class='del'>-  activated = GTK_TOGGLE_BUTTON(button)-&gt;active;</div><div class='del'>-*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pilot_capplet_setup(void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame, *table;</div><div class='del'>-</div><div class='del'>-	capplet = capplet_widget_new();</div><div class='del'>-</div><div class='del'>-	table = gtk_table_new(1, 2, FALSE);</div><div class='del'>-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(capplet), table); </div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new(_("Conduit state"));</div><div class='del'>-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);</div><div class='del'>-	cfgStateWindow = createStateCfgWindow();</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "try",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doTrySettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doRevertSettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doSaveSettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "cancel",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doCancelSettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			   GTK_SIGNAL_FUNC(about_cb), NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	setStateCfg(cfgStateWindow,curState);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all(capplet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-run_error_dialog(gchar *mesg,...) {</div><div class='del'>-	char tmp[80];</div><div class='del'>-	va_list ap;</div><div class='del'>-	</div><div class='del'>-	va_start(ap,mesg);</div><div class='del'>-	vsnprintf(tmp,79,mesg,ap);</div><div class='del'>-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);</div><div class='del'>-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));</div><div class='del'>-	va_end(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint get_pilot_id_from_gpilotd() {</div><div class='del'>-	gint *pilots;</div><div class='del'>-	int i;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	gpilotd_get_pilot_ids(&amp;pilots);</div><div class='del'>-	if(pilots) {</div><div class='del'>-		while(pilots[i]!=-1) { g_message("pilot %d = \"%d\"",i,pilots[i]); i++; }</div><div class='del'>-		if(i==0) {</div><div class='del'>-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			if(i==1) </div><div class='del'>-				return pilots[0];</div><div class='del'>-			else {</div><div class='del'>-				g_message("too many pilots...");</div><div class='del'>-				return pilots[0];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-		return -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'>-	/* we're a capplet */</div><div class='del'>-	gnome_capplet_init ("calendar conduit control applet", NULL, argc, argv, </div><div class='del'>-			    NULL,</div><div class='del'>-			    0, NULL);</div><div class='del'>-</div><div class='del'>-	/* get pilot name from gpilotd */</div><div class='del'>-	/* 1. initialize the gpilotd connection */</div><div class='del'>-	if (gpilotd_init(&amp;argc,argv)!=0) {</div><div class='del'>-		run_error_dialog(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-		g_error(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-    </div><div class='del'>-	/* 2 connect to gpilotd */</div><div class='del'>-	if (gpilotd_connect()!=0) {</div><div class='del'>-		run_error_dialog(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-		g_error(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-    </div><div class='del'>-	pilotId = get_pilot_id_from_gpilotd();</div><div class='del'>-	if(!pilotId) return -1;</div><div class='del'>-</div><div class='del'>-	/* put all code to set things up in here */</div><div class='del'>-	conduit = gpilotd_conduit_mgmt_new("calendar_conduit",pilotId);</div><div class='del'>-	gcalconduit_load_configuration(&amp;origState,pilotId);</div><div class='del'>-	gpilotd_conduit_mgmt_get_sync_type(conduit,pilotId,&amp;origState-&gt;sync_type);</div><div class='del'>-</div><div class='del'>-	curState = gcalconduit_dupe_configuration(origState);</div><div class='del'>-    </div><div class='del'>-	pilot_capplet_setup();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* done setting up, now run main loop */</div><div class='del'>-	capplet_gtk_main();</div><div class='del'>-	return 0;</div><div class='del'>-}    </div><div class='head'>diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/calendar-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index 2a5af4f24e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit-control-applet.desktop?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/calendar/calendar-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=GnomeCalendar</div><div class='del'>-Name[da]=Gnome kalender</div><div class='del'>-Name[no]=GNOME kalender</div><div class='del'>-Comment=Configure the GnomeCal conduit</div><div class='del'>-Comment[da]=Konfigurér GnomeCal-komponent</div><div class='del'>-Comment[no]=Konfigurér GnomeCal-komponent</div><div class='del'>-Exec=calendar-conduit-control-applet --cap-id=1</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</div><div class='del'>-Icon=gnome-calendar-conduit.png</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 2cddd84186..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/calendar/calendar-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1406 +0,0 @@</div><div class='del'>-/* $Id$ */</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;utime.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;errno.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-file.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnome-factory.h&gt;</div><div class='del'>-#include &lt;pi-version.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-standard-abs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "GnomeCal.h"</div><div class='del'>-#include "calendar-conduit.h"</div><div class='del'>-</div><div class='del'>-int debug_alarms = 0;  /* needed to satisfy some other part of gncal */</div><div class='del'>-/* Default values for alarms */ /* needed to satisfy some other part of gncal */</div><div class='del'>-CalendarAlarm alarm_defaults[4] = {</div><div class='del'>-	{ ALARM_MAIL, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_PROGRAM, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_DISPLAY, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_AUDIO, 0, 15, ALARM_MINUTES }</div><div class='del'>-};</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'>-void local_record_from_icalobject(GCalLocalRecord *local,iCalObject *obj); </div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.8.11"</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 "gcalconduit" </div><div class='del'>-</div><div class='del'>-#define DEBUG_CALCONDUIT </div><div class='del'>-#undef DEBUG_CALCONDUIT</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-#define show_exception(e) g_warning ("Exception: %s\n", CORBA_exception_id (e))</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 show_exception(e)</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 catch_ret_val(_env,ret)                                                                 \</div><div class='del'>-  if (_env._major != CORBA_NO_EXCEPTION) {                                                      \</div><div class='del'>-        g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,"%s:%d: Caught exception",__FILE__,__LINE__);    \</div><div class='del'>-        g_warning ("Exception: %s\n", CORBA_exception_id (&amp;(_env)));                               \</div><div class='del'>-	CORBA_exception_free(&amp;(_env));                                                             \</div><div class='del'>-	return ret;                                                                             \</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_calendar_server (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		       GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail(conduit!=NULL,-2);</div><div class='del'>-	g_return_val_if_fail(ctxt!=NULL,-2);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;calendar = goad_server_activate_with_id (NULL, </div><div class='del'>-						       "IDL:GNOME:Calendar:Repository:1.0",</div><div class='del'>-						       0, NULL);</div><div class='del'>-	if (ctxt-&gt;calendar == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Can not communicate with GnomeCalendar server");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-  </div><div class='del'>-	if (ctxt-&gt;ev._major != CORBA_NO_EXCEPTION){</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev));</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'>-/* Just a stub to link with */</div><div class='del'>-void</div><div class='del'>-calendar_notify (time_t time, CalendarAlarm *which, void *data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GSList * </div><div class='del'>-get_calendar_objects(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		     gboolean *status,</div><div class='del'>-		     GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	GSList *result;</div><div class='del'>-	GNOME_Calendar_Repository_String_Sequence *uids;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(conduit!=NULL,NULL);</div><div class='del'>-	g_return_val_if_fail(ctxt!=NULL,NULL);</div><div class='del'>-</div><div class='del'>-	result = NULL;</div><div class='del'>-	uids = GNOME_Calendar_Repository_get_object_id_list (ctxt-&gt;calendar, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-  	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		if(status!=NULL) (*status) = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		if(status!=NULL) (*status) = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	if(status!=NULL) (*status) = TRUE;</div><div class='del'>-	if(uids-&gt;_length&gt;0) {</div><div class='del'>-		int i;</div><div class='del'>-		for(i=0;i&lt;uids-&gt;_length;i++) {</div><div class='del'>-			result = g_slist_prepend(result,g_strdup(uids-&gt;_buffer[i]));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		INFO ("No entries found");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_free(uids);</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'>-local_record_from_ical_uid(GCalLocalRecord *local,</div><div class='del'>-			   char *uid,</div><div class='del'>-			   GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	char *vcalendar_string;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-	</div><div class='del'>-	vcalendar_string = GNOME_Calendar_Repository_get_object(ctxt-&gt;calendar, uid, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-  	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} </div><div class='del'>-	g_return_if_fail(vcalendar_string!=NULL);</div><div class='del'>-	</div><div class='del'>-	obj = ical_object_new_from_string (vcalendar_string);</div><div class='del'>-</div><div class='del'>-	local_record_from_icalobject(local,obj);</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'>- * converts a iCalObject to a GCalLocalRecord</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-local_record_from_icalobject(GCalLocalRecord *local,</div><div class='del'>-			     iCalObject *obj) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(local!=NULL);</div><div class='del'>-	g_return_if_fail(obj!=NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;ical = obj;</div><div class='del'>-	local-&gt;local.ID = local-&gt;ical-&gt;pilot_id;</div><div class='del'>-  </div><div class='del'>-/*</div><div class='del'>-	LOG ("local-&gt;Id = %ld [%s], status = %d",</div><div class='del'>-		  local-&gt;local.ID,obj-&gt;summary,local-&gt;ical-&gt;pilot_status);</div><div class='del'>-*/</div><div class='del'>-	switch(local-&gt;ical-&gt;pilot_status) {</div><div class='del'>-	case ICAL_PILOT_SYNC_NONE: </div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing; </div><div class='del'>-		break;</div><div class='del'>-	case ICAL_PILOT_SYNC_MOD: </div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordModified; </div><div class='del'>-		break;</div><div class='del'>-	case ICAL_PILOT_SYNC_DEL: </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'>-	/* Records without a pilot_id are new */</div><div class='del'>-	if(local-&gt;local.ID == 0) </div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNew; </div><div class='del'>-  </div><div class='del'>-	local-&gt;local.secret = 0;</div><div class='del'>-	if(obj-&gt;class!=NULL) </div><div class='del'>-		if(strcmp(obj-&gt;class,"PRIVATE")==0)</div><div class='del'>-			local-&gt;local.secret = 1;</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'>-/*</div><div class='del'>- * Given a PilotRecord, find the matching record in</div><div class='del'>- * the calendar repository. If no match, return NULL</div><div class='del'>- */</div><div class='del'>-static GCalLocalRecord *</div><div class='del'>-find_record_in_repository(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-			  PilotRecord *remote,</div><div class='del'>-			  GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *vcal_string;</div><div class='del'>-	GCalLocalRecord *loc;</div><div class='del'>-  </div><div class='del'>-	g_return_val_if_fail(conduit!=NULL,NULL);</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,NULL);</div><div class='del'>-  </div><div class='del'>-	LOG ("requesting %ld", remote-&gt;ID);</div><div class='del'>-</div><div class='del'>-	vcal_string = </div><div class='del'>-		GNOME_Calendar_Repository_get_object_by_pilot_id (ctxt-&gt;calendar, remote-&gt;ID, &amp;(ctxt-&gt;ev));</div><div class='del'>-  </div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return NULL;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("Found");</div><div class='del'>-		loc = g_new0(GCalLocalRecord,1);</div><div class='del'>-		/* memory allocated in new_from_string is freed in free_match */</div><div class='del'>-		local_record_from_icalobject(loc,</div><div class='del'>-					     ical_object_new_from_string (vcal_string));</div><div class='del'>-		/* g_free(vcal_string); FIXME: this coredumps, but won't it leak without ? */</div><div class='del'>-		return loc;</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'>- * updates an given iCalObject in the repository</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-update_calendar_entry_in_repository(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-				    iCalObject *obj,</div><div class='del'>-				    GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(conduit!=NULL);</div><div class='del'>-	g_return_if_fail(obj!=NULL);</div><div class='del'>-</div><div class='del'>-	str = calendar_string_from_object (obj);</div><div class='del'>-  </div><div class='del'>-	GNOME_Calendar_Repository_update_object (ctxt-&gt;calendar, obj-&gt;uid, str, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-  	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static iCalObject *</div><div class='del'>-ical_from_remote_record(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-			PilotRecord *remote,</div><div class='del'>-			iCalObject *in_obj)</div><div class='del'>-{</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	int i;</div><div class='del'>-	struct Appointment a;</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_return_val_if_fail(remote!=NULL,NULL);</div><div class='del'>-	memset(&amp;a,0,sizeof(struct Appointment));</div><div class='del'>-	unpack_Appointment(&amp;a,remote-&gt;record,remote-&gt;length);</div><div class='del'>-	</div><div class='del'>-	if (in_obj == NULL)</div><div class='del'>-		obj = ical_new (a.note ? a.note : "",</div><div class='del'>-				g_get_user_name (),</div><div class='del'>-				a.description ? a.description : "");</div><div class='del'>-	else </div><div class='del'>-		obj = in_obj;</div><div class='del'>-	</div><div class='del'>-	if (a.note) {</div><div class='del'>-		g_free(obj-&gt;comment);</div><div class='del'>-		obj-&gt;comment = g_strdup(a.note);</div><div class='del'>-	}</div><div class='del'>-	if (a.description) {</div><div class='del'>-		g_free(obj-&gt;summary);</div><div class='del'>-		obj-&gt;summary = g_strdup(a.description);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	obj-&gt;created = now;</div><div class='del'>-	obj-&gt;last_mod = now;</div><div class='del'>-	obj-&gt;priority = 0;</div><div class='del'>-	obj-&gt;transp = 0;</div><div class='del'>-	obj-&gt;related = NULL;</div><div class='del'>-	obj-&gt;pilot_id = remote-&gt;ID;</div><div class='del'>-	obj-&gt;pilot_status = ICAL_PILOT_SYNC_NONE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Begin and end</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (a.event)</div><div class='del'>-	{</div><div class='del'>-		/* turn day-long events into a full day's appointment</div><div class='del'>-		   FIXME: get settings from gnomecal */</div><div class='del'>-		a.begin.tm_sec = 0;</div><div class='del'>-		a.begin.tm_min = 0;</div><div class='del'>-		a.begin.tm_hour = 0;</div><div class='del'>-</div><div class='del'>-		a.end.tm_sec = 0;</div><div class='del'>-		a.end.tm_min =59;</div><div class='del'>-		a.end.tm_hour = 23;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	obj-&gt;dtstart = mktime (&amp;a.begin);</div><div class='del'>-	obj-&gt;dtend = mktime (&amp;a.end);</div><div class='del'>-</div><div class='del'>-	/* Special case: daily repetitions are converted to a multi-day event */</div><div class='del'>-	/* This sucketh, a pilot event scheduled for dailyRepeat, freq 1, end on </div><div class='del'>-	   whatever is cleary converted wrong </div><div class='del'>-	if (a.repeatType == repeatDaily){</div><div class='del'>-		time_t newt = time_add_day (obj-&gt;dtend, a.repeatFrequency);</div><div class='del'>-</div><div class='del'>-		obj-&gt;dtend = newt;</div><div class='del'>-	}</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Alarm</div><div class='del'>-	 */</div><div class='del'>-	if (a.alarm){</div><div class='del'>-		obj-&gt;aalarm.type = ALARM_AUDIO;</div><div class='del'>-		obj-&gt;aalarm.enabled = 1;</div><div class='del'>-		obj-&gt;aalarm.count = a.advance;</div><div class='del'>-</div><div class='del'>-		switch (a.advanceUnits){</div><div class='del'>-		case advMinutes:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_MINUTES;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case advHours:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_HOURS;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case advDays:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_DAYS;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Recurrence</div><div class='del'>-	 */</div><div class='del'>-	if (a.repeatFrequency){</div><div class='del'>-		obj-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-		</div><div class='del'>-		switch (a.repeatType){</div><div class='del'>-		case repeatDaily:</div><div class='del'>-			/*</div><div class='del'>-			 * In the Pilot daily repetitions are actually</div><div class='del'>-			 * multi-day events</div><div class='del'>-			 */</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_DAILY;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatMonthlyByDate:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_MONTHLY_BY_DAY;</div><div class='del'>-			obj-&gt;recur-&gt;u.month_day = a.repeatFrequency;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatWeekly:</div><div class='del'>-		{</div><div class='del'>-			int wd;</div><div class='del'>-</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_WEEKLY;</div><div class='del'>-			for (wd = 0; wd &lt; 7; wd++)</div><div class='del'>-				if (a.repeatDays [wd])</div><div class='del'>-					obj-&gt;recur-&gt;weekday |= 1 &lt;&lt; wd;</div><div class='del'>-</div><div class='del'>-			if (obj-&gt;recur-&gt;weekday == 0){</div><div class='del'>-				struct tm tm = *localtime (&amp;obj-&gt;dtstart);</div><div class='del'>-</div><div class='del'>-				obj-&gt;recur-&gt;weekday = 1 &lt;&lt; tm.tm_wday;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		case repeatMonthlyByDay:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_MONTHLY_BY_POS;</div><div class='del'>-			obj-&gt;recur-&gt;u.month_pos = a.repeatFrequency;</div><div class='del'>-			obj-&gt;recur-&gt;weekday = (a.repeatDay / 7);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatYearly:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_YEARLY_BY_DAY;</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 (a.repeatForever)</div><div class='del'>-			obj-&gt;recur-&gt;duration = 0;</div><div class='del'>-		else</div><div class='del'>-			obj-&gt;recur-&gt;_enddate = mktime (&amp;a.repeatEnd);</div><div class='del'>-</div><div class='del'>-		obj-&gt;recur-&gt;interval = a.repeatFrequency;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Load exception dates </div><div class='del'>-	 */</div><div class='del'>-	obj-&gt;exdate = NULL;</div><div class='del'>-	for (i = 0; i &lt; a.exceptions; i++){</div><div class='del'>-		time_t *t = g_new (time_t, 1);</div><div class='del'>-</div><div class='del'>-		*t = mktime (&amp;(a.exception [i]));</div><div class='del'>-		obj-&gt;exdate = g_list_prepend (obj-&gt;exdate, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (obj-&gt;class);</div><div class='del'>-	</div><div class='del'>-	if (remote-&gt;attr &amp; dlpRecAttrSecret)</div><div class='del'>-		obj-&gt;class = g_strdup ("PRIVATE");</div><div class='del'>-	else</div><div class='del'>-		obj-&gt;class = g_strdup ("PUBLIC");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	free_Appointment(&amp;a);</div><div class='del'>-</div><div class='del'>-	return obj;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Code blatantly stolen from</div><div class='del'>- * calendar-pilot-sync.c:</div><div class='del'>- *   </div><div class='del'>- * (C) 1999 International GNOME Support</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Miguel de Icaza (miguel@gnome-support.com)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-update_record (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	       PilotRecord *remote,</div><div class='del'>-	       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	char *vcal_string;</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	struct Appointment a;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	memset(&amp;a,0,sizeof(struct Appointment));</div><div class='del'>-	unpack_Appointment(&amp;a,remote-&gt;record,remote-&gt;length);</div><div class='del'>-	</div><div class='del'>-	obj = ical_new (a.note ? a.note : "",</div><div class='del'>-			g_get_user_name (),</div><div class='del'>-			a.description ? a.description : "");</div><div class='del'>-</div><div class='del'>-	LOG ("requesting %ld [%s]", remote-&gt;ID, a.description);</div><div class='del'>-	vcal_string = GNOME_Calendar_Repository_get_object_by_pilot_id (ctxt-&gt;calendar, remote-&gt;ID, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		LOG ("Object did not exist, creating a new one");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		ical_from_remote_record(conduit,remote,obj);</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-	        WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		ical_object_unref (obj); </div><div class='del'>-		free_Appointment(&amp;a);</div><div class='del'>-		return -1;</div><div class='del'>-	} else {</div><div class='del'>-	        LOG ("Found");</div><div class='del'>-		ical_object_unref (obj);</div><div class='del'>-		obj = ical_object_new_from_string (vcal_string);</div><div class='del'>-		ical_from_remote_record(conduit,remote,obj);</div><div class='del'>-		CORBA_free(vcal_string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update record on server */</div><div class='del'>-	</div><div class='del'>-	update_calendar_entry_in_repository(conduit,obj,ctxt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Shutdown</div><div class='del'>-	 */</div><div class='del'>-	ical_object_unref (obj);</div><div class='del'>-	free_Appointment(&amp;a);</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'>-check_for_slow_setting(GnomePilotConduit *c, </div><div class='del'>-		       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CORBA_long entry_number;</div><div class='del'>-	entry_number = </div><div class='del'>-		GNOME_Calendar_Repository_get_number_of_objects(ctxt-&gt;calendar, </div><div class='del'>-								GNOME_Calendar_Repository_ANY,</div><div class='del'>-								&amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-	        WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-	} else {</div><div class='del'>-		LOG (_("Calendar holds %d entries"),entry_number);</div><div class='del'>-		/* If the local base is empty, do a slow sync */</div><div class='del'>-		if ( entry_number &lt;= 0) {</div><div class='del'>-			gnome_pilot_conduit_standard_set_slow(GNOME_PILOT_CONDUIT_STANDARD(c));</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'>-pre_sync(GnomePilotConduit *c, </div><div class='del'>-	 GnomePilotDBInfo *dbi,</div><div class='del'>-	 GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	int l;</div><div class='del'>-	gint num_records;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-  </div><div class='del'>-	g_message ("GnomeCal Conduit v.%s",CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;calendar = CORBA_OBJECT_NIL;</div><div class='del'>-	</div><div class='del'>-	if (start_calendar_server(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start gnomecal server"));</div><div class='del'>-		gnome_pilot_conduit_error(GNOME_PILOT_CONDUIT(c),</div><div class='del'>-					  _("Could not start gnomecal server"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-  </div><div class='del'>-	/* Set the counters for the progress bar crap */</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_ANY, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-							       num_records);</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_MODIFIED, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_updated_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-								       num_records);</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_NEW, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_new_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-								   num_records);</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_DELETED, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_deleted_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-								       num_records);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(c),"dbinfo",dbi);</div><div class='del'>-  </div><div class='del'>-	/* load_records(c); */</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc(0xffff);</div><div class='del'>-	if((l=dlp_ReadAppBlock(dbi-&gt;pilot_socket,dbi-&gt;db_handle,0,(unsigned char *)buf,0xffff)) &lt; 0) {</div><div class='del'>-		WARN(_("Could not read pilot's DateBook application block"));</div><div class='del'>-		WARN("dlp_ReadAppBlock(...) = %d",l);</div><div class='del'>-		gnome_pilot_conduit_error(GNOME_PILOT_CONDUIT(c),</div><div class='del'>-			     _("Could not read pilot's DateBook application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_AppointmentAppInfo(&amp;(ctxt-&gt;ai),buf,l);</div><div class='del'>-	g_free(buf);</div><div class='del'>-</div><div class='del'>-	check_for_slow_setting(c,ctxt);</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'>- * Find (if possible) the local record which matches</div><div class='del'>- * the given PilotRecord.</div><div class='del'>- * if successfull, return non-zero and set *local to</div><div class='del'>- * a non-null value (the located local record),</div><div class='del'>- * otherwise return 0 and set *local = NULL;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match_record	(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		 GCalLocalRecord **local,</div><div class='del'>-		 PilotRecord *remote,</div><div class='del'>-		 GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("in match_record");</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 = find_record_in_repository(conduit,remote,ctxt);</div><div class='del'>-  </div><div class='del'>-	if (*local==NULL) return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Free the data allocated by a previous match_record call.</div><div class='del'>- * If successfull, return non-zero and ser *local=NULL, otherwise</div><div class='del'>- * return 0.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-free_match	(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		 GCalLocalRecord **local,</div><div class='del'>-		 GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering free_match");</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!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	ical_object_unref (GCAL_LOCALRECORD(*local)-&gt;ical); </div><div class='del'>-	g_free(*local);</div><div class='del'>-	</div><div class='del'>-        *local = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  Move to archive and set status to Nothing</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-archive_local (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	       GCalLocalRecord *local,</div><div class='del'>-	       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering archive_local");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-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'>-  Store in archive and set status to Nothing</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-archive_remote (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		GCalLocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering archive_remote");</div><div class='del'>-</div><div class='del'>-        g_return_val_if_fail(remote!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-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'>-  Store and set status to Nothing</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-store_remote (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	      PilotRecord *remote,</div><div class='del'>-	      GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering store_remote");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,-1);</div><div class='del'>-	remote-&gt;attr = GnomePilotRecordNothing;</div><div class='del'>-</div><div class='del'>-	return update_record(conduit,remote,ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-clear_status_archive_local (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-			    GCalLocalRecord *local,</div><div class='del'>-			    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering clear_status_archive_local");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-</div><div class='del'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-iterate (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	 GCalLocalRecord **local,</div><div class='del'>-	 GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GSList *events,*iterator;</div><div class='del'>-	static int hest;</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 iteration");</div><div class='del'>-</div><div class='del'>-		events = get_calendar_objects(conduit,NULL,ctxt);</div><div class='del'>-		hest = 0;</div><div class='del'>-		</div><div class='del'>-		if(events!=NULL) {</div><div class='del'>-			LOG ("iterating over %d records",g_slist_length(events));</div><div class='del'>-			*local = g_new0(GCalLocalRecord,1);</div><div class='del'>-</div><div class='del'>-			local_record_from_ical_uid(*local,(gchar*)events-&gt;data,ctxt);</div><div class='del'>-			iterator = events;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*LOG ("continuing iteration");*/</div><div class='del'>-		hest++;</div><div class='del'>-		if(g_slist_next(iterator)==NULL) {</div><div class='del'>-			GSList *l;</div><div class='del'>-</div><div class='del'>-			LOG ("ending");</div><div class='del'>-			/** free stuff allocated for iteration */</div><div class='del'>-			g_free((*local));</div><div class='del'>-</div><div class='del'>-			LOG ("iterated over %d records",hest);</div><div class='del'>-			for(l=events;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(events);</div><div class='del'>-</div><div class='del'>-			/* ends iteration */</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			iterator = g_slist_next(iterator);</div><div class='del'>-			local_record_from_ical_uid(*local,(gchar*)(iterator-&gt;data),ctxt);</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 gint</div><div class='del'>-iterate_specific (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		  GCalLocalRecord **local,</div><div class='del'>-		  gint flag,</div><div class='del'>-		  gint archived,</div><div class='del'>-		  GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-	{</div><div class='del'>-		gchar *tmp;</div><div class='del'>-		switch (flag) {</div><div class='del'>-		case GnomePilotRecordNothing: tmp = g_strdup("RecordNothing"); break;</div><div class='del'>-		case GnomePilotRecordModified: tmp = g_strdup("RecordModified"); break;</div><div class='del'>-		case GnomePilotRecordNew: tmp = g_strdup("RecordNew"); break;</div><div class='del'>-		default: tmp = g_strdup_printf("0x%x",flag); break;</div><div class='del'>-		}</div><div class='del'>-		LOG ("entering iterate_specific(flag = %s)",tmp);</div><div class='del'>-		g_free(tmp);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	/* iterate until a record meets the criteria */</div><div class='del'>-	while(gnome_pilot_conduit_standard_abs_iterate(conduit,(LocalRecord**)local)) {</div><div class='del'>-		if((*local)==NULL) break;</div><div class='del'>-		if(archived &amp;&amp; ((*local)-&gt;local.archived==archived)) break;</div><div class='del'>-		if(((*local)-&gt;local.attr == flag)) break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (*local)==NULL?0:1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-purge (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering purge");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* HEST, gem posterne her */</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	    GCalLocalRecord *local,</div><div class='del'>-	    gint status,</div><div class='del'>-	    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering set_status(status=%d)",status);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-	</div><div class='del'>-	local-&gt;local.attr = status;</div><div class='del'>-	switch(status) {</div><div class='del'>-	case GnomePilotRecordPending:</div><div class='del'>-	case GnomePilotRecordNothing:</div><div class='del'>-		local-&gt;ical-&gt;pilot_status = ICAL_PILOT_SYNC_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case GnomePilotRecordDeleted:</div><div class='del'>-		break;</div><div class='del'>-	case GnomePilotRecordNew:</div><div class='del'>-	case GnomePilotRecordModified:</div><div class='del'>-		local-&gt;ical-&gt;pilot_status = ICAL_PILOT_SYNC_MOD;</div><div class='del'>-		break;	  </div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if ( status == GnomePilotRecordDeleted) {</div><div class='del'>-		GNOME_Calendar_Repository_delete_object(ctxt-&gt;calendar,local-&gt;ical-&gt;uid,&amp;(ctxt-&gt;ev));</div><div class='del'>-	} else {</div><div class='del'>-		GNOME_Calendar_Repository_update_pilot_id(ctxt-&gt;calendar,</div><div class='del'>-							  local-&gt;ical-&gt;uid,</div><div class='del'>-							  local-&gt;local.ID,</div><div class='del'>-							  local-&gt;ical-&gt;pilot_status,</div><div class='del'>-							  &amp;(ctxt-&gt;ev));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		LOG ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return -1;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </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 gint</div><div class='del'>-set_archived (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	      GCalLocalRecord *local,</div><div class='del'>-	      gint archived,</div><div class='del'>-	      GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering set_archived");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = archived;</div><div class='del'>-	update_calendar_entry_in_repository(conduit,local-&gt;ical,ctxt);</div><div class='del'>-	/* FIXME: This should move the entry into a speciel</div><div class='del'>-	   calendar file, eg. Archive, or (by config option), simply</div><div class='del'>-	   delete it */</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 (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	      GCalLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering set_pilot_id(id=%d)",ID);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;local.ID = ID;</div><div class='del'>-	local-&gt;ical-&gt;pilot_id = ID;</div><div class='del'>-	GNOME_Calendar_Repository_update_pilot_id(ctxt-&gt;calendar,</div><div class='del'>-						  local-&gt;ical-&gt;uid,</div><div class='del'>-						  local-&gt;local.ID,</div><div class='del'>-						  local-&gt;ical-&gt;pilot_status,</div><div class='del'>-						  &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		LOG ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return -1;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </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 gint</div><div class='del'>-transmit (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	  GCalLocalRecord *local,</div><div class='del'>-	  PilotRecord **remote,</div><div class='del'>-	  GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	PilotRecord *p;</div><div class='del'>-	int daycount;</div><div class='del'>-	</div><div class='del'>-	LOG ("entering transmit");</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'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-</div><div class='del'>-	p = g_new0(PilotRecord,1);</div><div class='del'>-</div><div class='del'>-	p-&gt;ID = local-&gt;local.ID;</div><div class='del'>-	p-&gt;attr = local-&gt;local.attr;</div><div class='del'>-	p-&gt;archived = local-&gt;local.archived;</div><div class='del'>-	p-&gt;secret = local-&gt;local.secret;</div><div class='del'>-</div><div class='del'>-	local-&gt;a = g_new0(struct Appointment,1);</div><div class='del'>-</div><div class='del'>-	local-&gt;a-&gt;event = 0; /* if no start time, leave at 1 */</div><div class='del'>-	local-&gt;a-&gt;begin = *localtime(&amp;local-&gt;ical-&gt;dtstart);</div><div class='del'>-	local-&gt;a-&gt;end = *localtime(&amp;local-&gt;ical-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	/* set the Audio Alarm  parameters */</div><div class='del'>-	if(local-&gt;ical-&gt;aalarm.enabled) {</div><div class='del'>-		local-&gt;a-&gt;alarm = 1;</div><div class='del'>-		local-&gt;a-&gt;advance = local-&gt;ical-&gt;aalarm.count;</div><div class='del'>-		switch(local-&gt;ical-&gt;aalarm.units) {</div><div class='del'>-		case ALARM_MINUTES:</div><div class='del'>-			local-&gt;a-&gt;advanceUnits = advMinutes;</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_HOURS:</div><div class='del'>-			local-&gt;a-&gt;advanceUnits = advHours;</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_DAYS:</div><div class='del'>-			local-&gt;a-&gt;advanceUnits = advDays;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;a-&gt;alarm = 0;</div><div class='del'>-		local-&gt;a-&gt;advance = 0;</div><div class='del'>-		local-&gt;a-&gt;advanceUnits = advMinutes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the recurrence parameters */</div><div class='del'>-	if (local-&gt;ical-&gt;recur != NULL) {</div><div class='del'>-		switch (local-&gt;ical-&gt;recur-&gt;type) {</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatDaily;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatWeekly;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_POS:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatMonthlyByDate;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatMonthlyByDay;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;ical-&gt;recur-&gt;duration == 0) {</div><div class='del'>-			local-&gt;a-&gt;repeatForever = 1;</div><div class='del'>-		} else {</div><div class='del'>-			local-&gt;a-&gt;repeatForever = 0;</div><div class='del'>-			local-&gt;a-&gt;repeatEnd = *localtime(&amp;local-&gt;ical-&gt;recur-&gt;_enddate);</div><div class='del'>-		}</div><div class='del'>-		local-&gt;a-&gt;repeatFrequency = local-&gt;ical-&gt;recur-&gt;interval; </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		for ( daycount=0; daycount&lt;7; daycount++ ) {</div><div class='del'>-			if (local-&gt;ical-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; daycount))</div><div class='del'>-				local-&gt;a-&gt;repeatDays[daycount] = 1;</div><div class='del'>- 		}</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;a-&gt;repeatType = repeatNone;</div><div class='del'>-		local-&gt;a-&gt;repeatForever = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatEnd = local-&gt;a-&gt;end;</div><div class='del'>-		local-&gt;a-&gt;repeatFrequency = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDay = dom1stSun;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[0] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[1] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[2] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[3] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[4] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[5] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[6] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatWeekstart = 0;</div><div class='del'>-		local-&gt;a-&gt;exceptions = 0;</div><div class='del'>-		local-&gt;a-&gt;exception = NULL;</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 deallocte */</div><div class='del'>-	local-&gt;a-&gt;note = </div><div class='del'>-		local-&gt;ical-&gt;comment==NULL?NULL:strdup(local-&gt;ical-&gt;comment);</div><div class='del'>-	local-&gt;a-&gt;description = </div><div class='del'>-		local-&gt;ical-&gt;summary==NULL?NULL:strdup(local-&gt;ical-&gt;summary);</div><div class='del'>-</div><div class='del'>-	/* Generate pilot record structure */</div><div class='del'>-	p-&gt;record = g_new0(char,0xffff);</div><div class='del'>-	p-&gt;length = pack_Appointment(local-&gt;a,p-&gt;record,0xffff);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* This is some debug code that hexdumps the calendar entry...</div><div class='del'>-	   You won't need this. */</div><div class='del'>-	{</div><div class='del'>-		int x,y;</div><div class='del'>-		g_message("calconduit: new item from %s to %s",asctime(&amp;(local-&gt;a-&gt;begin)),asctime(&amp;(local-&gt;a-&gt;end))); </div><div class='del'>-		</div><div class='del'>-		g_message("local-&gt;a-&gt;note = %s",local-&gt;a-&gt;note);</div><div class='del'>-		g_message("local-&gt;a-&gt;description = %s",local-&gt;a-&gt;description);</div><div class='del'>-		g_message("sizeof(p-&gt;record) = %d, length is %d",sizeof(p-&gt;record),p-&gt;length);</div><div class='del'>-		for(x=0;x&lt;p-&gt;length;x+=32) {</div><div class='del'>-			for(y=x;y&lt;x+32;y++)</div><div class='del'>-				if(p-&gt;record[y]&lt;33 || p-&gt;record[y]&gt;128)</div><div class='del'>-					printf("%02X",p-&gt;record[y]);</div><div class='del'>-				else </div><div class='del'>-					printf(" %c",p-&gt;record[y]);</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'>-	*remote = p;</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_transmit (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	       GCalLocalRecord *local,</div><div class='del'>-	       PilotRecord **remote,</div><div class='del'>-	       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering free_transmit");</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'>-	free_Appointment(local-&gt;a);</div><div class='del'>-	g_free((*remote)-&gt;record);</div><div class='del'>-	*remote = NULL;</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 (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	    GCalLocalRecord *local,</div><div class='del'>-	    PilotRecord *remote,</div><div class='del'>-	    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	PilotRecord *remoteOfLocal;</div><div class='del'>-	int err;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	/* used by the tedious compare */</div><div class='del'>-	struct Appointment a; </div><div class='del'>-	int daycount;</div><div class='del'>-</div><div class='del'>-	g_message ("entering compare");</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'>-#if 1</div><div class='del'>-	err = transmit(conduit,local,&amp;remoteOfLocal,ctxt);</div><div class='del'>-	if (err != 0) return err;</div><div class='del'>-</div><div class='del'>-	retval = 0;</div><div class='del'>-	if (remote-&gt;length == remoteOfLocal-&gt;length) {</div><div class='del'>-		if (memcmp(remoteOfLocal-&gt;record,remote-&gt;record,remote-&gt;length)!=0) {</div><div class='del'>-			g_message("compare failed on contents");</div><div class='del'>-			retval = 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_message("compare failed on length");</div><div class='del'>-		retval = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_transmit(conduit,local,&amp;remoteOfLocal,ctxt);	</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-	/** FIXME: All the { LOG("yadayada"); return 1; } bloat is for debug purposes.</div><div class='del'>-	    Once this is known to work, compact to return 1;'s */</div><div class='del'>-</div><div class='del'>-	/* Check record attributes */</div><div class='del'>-	if (local-&gt;local.ID != remote-&gt;ID) {</div><div class='del'>-		LOG("failed local-&gt;local.ID == remote-&gt;ID");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;local.attr != remote-&gt;attr) {</div><div class='del'>-		LOG("failed local-&gt;local.attr == remote-&gt;attr");</div><div class='del'>-		return 1; </div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;local.archived != remote-&gt;archived) {</div><div class='del'>-		LOG("failed local-&gt;local.archived == remote-&gt;archived");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;local.secret != remote-&gt;secret) {</div><div class='del'>-		LOG("failed local-&gt;local.secret == remote-&gt;secret");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unpack_Appointment(&amp;a,remote-&gt;record,remote-&gt;length);</div><div class='del'>-	</div><div class='del'>-	/* Check records begin/end time */</div><div class='del'>-	if (a.event==0) {</div><div class='del'>-/* FIXME</div><div class='del'>-		if (a.begin != *localtime(&amp;local-&gt;ical-&gt;dtstart)) {</div><div class='del'>-			LOG("a.begin == *localtime(&amp;local-&gt;ical-&gt;dtstart)");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if (a.end != *localtime(&amp;local-&gt;ical-&gt;dtend)) {</div><div class='del'>-			LOG("a.end == *localtime(&amp;local-&gt;ical-&gt;dtend)");</div><div class='del'>-			return 1;</div><div class='del'>-		}			</div><div class='del'>-*/</div><div class='del'>-	} else {</div><div class='del'>-		LOG("failed local-&gt;a.event != 0, unsupported by gnomecal");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check records alarm settings */</div><div class='del'>-	if(a.alarm == 1) {</div><div class='del'>-		if (local-&gt;ical-&gt;aalarm.enabled == 1) {</div><div class='del'>-			if (a.advance != local-&gt;ical-&gt;aalarm.count) {</div><div class='del'>-				LOG("failed a.advance == local-&gt;ical-&gt;aalarm.count");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-			switch(local-&gt;ical-&gt;aalarm.units) {</div><div class='del'>-			case ALARM_MINUTES:</div><div class='del'>-				if (a.advanceUnits != advMinutes) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;aalarm.units == a.advanceUnits");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case ALARM_HOURS:</div><div class='del'>-				if (a.advanceUnits != advHours) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;aalarm.units == a.advanceUnits");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case ALARM_DAYS:</div><div class='del'>-				if (a.advanceUnits != advDays) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;aalarm.units == a.advanceUnits");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			LOG("failed a.alarm == 1 &amp;&amp; local-&gt;ical-&gt;aalarm.enabled == 1");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} else if  (local-&gt;ical-&gt;aalarm.enabled == 1) {</div><div class='del'>-		LOG("failed a.alarm != 1 &amp;&amp; local-&gt;ical-&gt;aalarm.enabled != 1");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check records recurrence settings */</div><div class='del'>-        /* If this code is broken, a more or less safe although not efficient</div><div class='del'>-	   approach is (other the fixing the bug), if either has recurrence, </div><div class='del'>-	   return 1, thus failing the comparision */</div><div class='del'>-	if (local-&gt;ical-&gt;recur != NULL) {</div><div class='del'>-		if (a.repeatType == repeatNone) {</div><div class='del'>-			LOG("failed: local-&gt;ical-&gt;recur != NULL &amp;&amp; a.repeatType != repeatNone");</div><div class='del'>-			return 1;</div><div class='del'>-		} </div><div class='del'>-		switch (local-&gt;ical-&gt;recur-&gt;type) {</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			if (a.repeatType != repeatDaily) {</div><div class='del'>-				LOG("failed a.repeatType == repeatDaily");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			if (a.repeatType != repeatWeekly) {</div><div class='del'>-				LOG("failed a.repeatType == repeatWeekly");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_POS:</div><div class='del'>-			if (a.repeatType != repeatMonthlyByDate) {</div><div class='del'>-				LOG("failed a.repeatType == repeatMonthlyByDate");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			if (a.repeatType != repeatMonthlyByDay) {</div><div class='del'>-				LOG("failed a.repeatType == repeatMonthlyByDay");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-			if (a.repeatType != repeatYearly) {</div><div class='del'>-				LOG("failed a.repeatType == repeatYearly");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-			if (a.repeatType != repeatYearly) {</div><div class='del'>-				LOG("failed a.repeatType == repeatYearly");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;ical-&gt;recur-&gt;duration == 0) {</div><div class='del'>-			if(a.repeatForever != 1) {</div><div class='del'>-				LOG("failed local-&gt;ical-&gt;recur-&gt;duration == 0 &amp;&amp; a.repeatForever == 1");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if(a.repeatForever != 0) {</div><div class='del'>-				LOG("failed local-&gt;ical-&gt;recur-&gt;duration != 0 &amp;&amp; ! a.repeatForever == 0");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-/* FIXME</div><div class='del'>-			if(a.repeatEnd != *localtime(&amp;local-&gt;ical-&gt;recur-&gt;_enddate)) {</div><div class='del'>-				LOG("failed a.repeatEnd == *localtime(&amp;local-&gt;ical-&gt;recur-&gt;_enddate)");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-*/</div><div class='del'>-		}</div><div class='del'>-		if (a.repeatFrequency != local-&gt;ical-&gt;recur-&gt;interval) {</div><div class='del'>-			LOG("failed a.repeatFrequency == local-&gt;ical-&gt;recur-&gt;interval");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		for (daycount = 0; daycount&lt;7; daycount++) {</div><div class='del'>-			if(local-&gt;ical-&gt;recur-&gt;weekday &amp; (1&lt;&lt;daycount)) {</div><div class='del'>-				if (a.repeatDays[daycount]!=1) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;recur-&gt;weekday &amp; (1&lt;&lt;daycount) &amp;&amp; a.repeatDays[daycount]==1");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (a.repeatDays[daycount]!=0) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;recur-&gt;weekday &amp;! (1&lt;&lt;daycount) &amp;&amp; a.repeatDays[daycount]==0");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (a.repeatType != repeatNone ) {</div><div class='del'>-		LOG("failed: local-&gt;ical-&gt;recur == NULL &amp;&amp; a.repeatType == repeatNone");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check the note and description */</div><div class='del'>-	if(a.note!=NULL) {</div><div class='del'>-		if(local-&gt;ical-&gt;comment==NULL) {</div><div class='del'>-			LOG("failed a.note != NULL &amp;&amp; local-&gt;ical-&gt;coment != NULL");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if(strcmp(local-&gt;ical-&gt;comment,a.note)!=0) {</div><div class='del'>-			LOG("failed strcmp(local-&gt;ical-&gt;comment,a.note)==0");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} if(local-&gt;ical-&gt;comment!=NULL) {</div><div class='del'>-		LOG("failed a.note == NULL &amp;&amp; local-&gt;ical-&gt;coment == NULL");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if(a.description!=NULL) {</div><div class='del'>-		if(local-&gt;ical-&gt;summary==NULL) {</div><div class='del'>-			LOG("failed a.description != NULL &amp;&amp; local-&gt;ical-&gt;coment != NULL");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if(strcmp(local-&gt;ical-&gt;summary,a.description)!=0) {</div><div class='del'>-			LOG("failed strcmp(local-&gt;ical-&gt;summary,a.description)==0");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} if(local-&gt;ical-&gt;summary!=NULL) {</div><div class='del'>-		LOG("failed a.description == NULL &amp;&amp; local-&gt;ical-&gt;coment == NULL");</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'>-static gint</div><div class='del'>-compare_backup (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		GCalLocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering compare_backup");</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'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_all (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GSList *events,*it;</div><div class='del'>-	gboolean error;</div><div class='del'>-</div><div class='del'>-	events = get_calendar_objects(conduit,&amp;error,ctxt);</div><div class='del'>-	</div><div class='del'>-	if (error == FALSE) return -1;</div><div class='del'>-	for (it=events;it;it = g_slist_next(it)) {</div><div class='del'>-		GNOME_Calendar_Repository_delete_object(ctxt-&gt;calendar,</div><div class='del'>-							it-&gt;data,</div><div class='del'>-							&amp;(ctxt-&gt;ev));</div><div class='del'>-		if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-			INFO ("Object did not exist");</div><div class='del'>-			show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-			CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			WARN (_("Error while communicating with calendar server"));</div><div class='del'>-			show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-			CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-			/* destroy loop, free data */</div><div class='del'>-			for (it=events;it;it = g_slist_next(it)) g_free(it-&gt;data);</div><div class='del'>-			g_slist_free(events);</div><div class='del'>-			return -1;</div><div class='del'>-		} </div><div class='del'>-		g_free(it-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	g_slist_free(events);</div><div class='del'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilotId)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	GCalConduitCfg *cfg;</div><div class='del'>-	GCalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_standard_abs_new ("DatebookDB", 0x64617465);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-	gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"GnomeCalConduit");</div><div class='del'>-</div><div class='del'>-	gcalconduit_load_configuration(&amp;cfg,pilotId);</div><div class='del'>-	gtk_object_set_data(retval,"gcalconduit_cfg",cfg);</div><div class='del'>-</div><div class='del'>-	gcalconduit_new_context(&amp;ctxt,cfg);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(retval),"gcalconduit_context",ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, 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'>-        GCalConduitCfg *cc;</div><div class='del'>-	GCalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-        cc = GET_GCALCONFIG(conduit);</div><div class='del'>-	ctxt = GET_GCALCONTEXT(conduit);</div><div class='del'>-</div><div class='del'>-	if(ctxt-&gt;calendar!=CORBA_OBJECT_NIL)</div><div class='del'>-		GNOME_Calendar_Repository_done (ctxt-&gt;calendar, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-        gcalconduit_destroy_configuration(&amp;cc);</div><div class='del'>-</div><div class='del'>-	gcalconduit_destroy_context(&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h<br/>deleted file mode 100644<br/>index fa8c151d4c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/calendar/calendar-conduit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#ifndef __CALENDAR_CONDUIT_H__</div><div class='del'>-#define __CALENDAR_CONDUIT_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;unistd.h&gt;</div><div class='del'>-#include &lt;gnome.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-standard-abs.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "GnomeCal.h"</div><div class='del'>-</div><div class='del'>-/* This is the local record structure for the GnomeCal conduit. */</div><div class='del'>-typedef struct _GCalLocalRecord GCalLocalRecord;</div><div class='del'>-struct _GCalLocalRecord {</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'>-	LocalRecord local;</div><div class='del'>-	/* The corresponding iCal object, as found by GnomeCal. */</div><div class='del'>-	iCalObject *ical;</div><div class='del'>-        /* pilot-link appointment structure, used for implementing Transmit. */	</div><div class='del'>-	struct Appointment *a;</div><div class='del'>-};</div><div class='del'>-#define GCAL_LOCALRECORD(s) ((GCalLocalRecord*)(s))</div><div class='del'>-</div><div class='del'>-/* This is the configuration of the GnomeCal conduit. */</div><div class='del'>-typedef struct _GCalConduitCfg GCalConduitCfg;</div><div class='del'>-struct _GCalConduitCfg {</div><div class='del'>-	gboolean open_secret;</div><div class='del'>-	guint32 pilotId;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */</div><div class='del'>-};</div><div class='del'>-#define GET_GCALCONFIG(c) ((GCalConduitCfg*)gtk_object_get_data(GTK_OBJECT(c),"gcalconduit_cfg"))</div><div class='del'>-</div><div class='del'>-/* This is the context for all the GnomeCal conduit methods. */</div><div class='del'>-typedef struct _GCalConduitContext GCalConduitContext;</div><div class='del'>-struct _GCalConduitContext {</div><div class='del'>-	struct AppointmentAppInfo ai;</div><div class='del'>-	GCalConduitCfg *cfg;</div><div class='del'>-	GNOME_Calendar_Repository calendar;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-};</div><div class='del'>-#define GET_GCALCONTEXT(c) ((GCalConduitContext*)gtk_object_get_data(GTK_OBJECT(c),"gcalconduit_context"))</div><div class='del'>-</div><div class='del'>-/* Given a GCalConduitCfg*, allocates the structure and </div><div class='del'>-   loads the configuration data for the given pilot. */</div><div class='del'>-static void </div><div class='del'>-gcalconduit_load_configuration(GCalConduitCfg **c,</div><div class='del'>-			       guint32 pilotId) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-	g_snprintf(prefix,255,"/gnome-pilot.d/calendard-conduit/Pilot_%u/",pilotId);</div><div class='del'>-	</div><div class='del'>-	*c = g_new0(GCalConduitCfg,1);</div><div class='del'>-	g_assert(*c != NULL);</div><div class='del'>-	gnome_config_push_prefix(prefix);</div><div class='del'>-	(*c)-&gt;open_secret = gnome_config_get_bool("open_secret=FALSE");</div><div class='del'>-	(*c)-&gt;sync_type = GnomePilotConduitSyncTypeCustom; /* set in capplets main */</div><div class='del'>-	gnome_config_pop_prefix();</div><div class='del'>-	</div><div class='del'>-	(*c)-&gt;pilotId = pilotId;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves the configuration data. */</div><div class='del'>-static void </div><div class='del'>-gcalconduit_save_configuration(GCalConduitCfg *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/calendar-conduit/Pilot_%u/",c-&gt;pilotId);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix(prefix);</div><div class='del'>-	gnome_config_set_bool("open_secret",c-&gt;open_secret);</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'>-/* Creates a duplicate of the configuration data */</div><div class='del'>-static GCalConduitCfg*</div><div class='del'>-gcalconduit_dupe_configuration(GCalConduitCfg *c) {</div><div class='del'>-	GCalConduitCfg *retval;</div><div class='del'>-	g_return_val_if_fail(c!=NULL,NULL);</div><div class='del'>-	retval = g_new0(GCalConduitCfg,1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;open_secret = c-&gt;open_secret;</div><div class='del'>-	retval-&gt;pilotId = c-&gt;pilotId;</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroys any data allocated by gcalconduit_load_configuration</div><div class='del'>-   and deallocates the given configuration. */</div><div class='del'>-static void </div><div class='del'>-gcalconduit_destroy_configuration(GCalConduitCfg **c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(c!=NULL);</div><div class='del'>-	g_return_if_fail(*c!=NULL);</div><div class='del'>-	g_free(*c);</div><div class='del'>-	*c = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Given a GCalConduitContxt*, allocates the structure */</div><div class='del'>-static void</div><div class='del'>-gcalconduit_new_context(GCalConduitContext **ctxt,</div><div class='del'>-			GCalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	*ctxt = g_new0(GCalConduitContext,1);</div><div class='del'>-	g_assert(ctxt!=NULL);</div><div class='del'>-	(*ctxt)-&gt;cfg = c;</div><div class='del'>-	CORBA_exception_init (&amp;((*ctxt)-&gt;ev));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroys any data allocated by gcalconduit_new_context</div><div class='del'>-   and deallocates its data. */</div><div class='del'>-static void</div><div class='del'>-gcalconduit_destroy_context(GCalConduitContext **ctxt)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(ctxt!=NULL);</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'>-		gcalconduit_destroy_configuration(&amp;((*ctxt)-&gt;cfg));</div><div class='del'>-*/</div><div class='del'>-	g_free(*ctxt);</div><div class='del'>-	*ctxt = NULL;</div><div class='del'>-}</div><div class='del'>-#endif __CALENDAR_CONDUIT_H__ </div><div class='head'>diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c<br/>deleted file mode 100644<br/>index 54a26715ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit-control-applet.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/todo/todo-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,287 +0,0 @@</div><div class='del'>-/* Control applet ("capplet") for the gnome-pilot todo conduit,             */</div><div class='del'>-/* based on                                                                 */</div><div class='del'>-/* gpilotd control applet ('capplet') for use with the GNOME control center */</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;capplet-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gpilotd/gpilotd-conduit-mgmt.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app-dummy-callbacks.h&gt;</div><div class='del'>-</div><div class='del'>-#include "todo-conduit.h"</div><div class='del'>-</div><div class='del'>-/* tell changes callbacks to ignore changes or not */</div><div class='del'>-static gboolean ignore_changes=FALSE;</div><div class='del'>-</div><div class='del'>-/* capplet widget */</div><div class='del'>-static GtkWidget *capplet=NULL;</div><div class='del'>-</div><div class='del'>-/* host/device/pilot configuration windows */</div><div class='del'>-GtkWidget *cfgOptionsWindow=NULL;</div><div class='del'>-GtkWidget *cfgStateWindow=NULL;</div><div class='del'>-GtkWidget *dialogWindow=NULL;</div><div class='del'>-</div><div class='del'>-gboolean activated,org_activation_state;</div><div class='del'>-GnomePilotConduitMgmt *conduit;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, ConduitCfg *conduitCfg);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, ConduitCfg *conduitCfg);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, ConduitCfg *conduitCfg);</div><div class='del'>-</div><div class='del'>-static void readStateCfg(GtkWidget *w);</div><div class='del'>-static void setStateCfg(GtkWidget *w);</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doTrySettings(GtkWidget *widget, ConduitCfg *conduitCfg)</div><div class='del'>-{</div><div class='del'>-    readStateCfg(cfgStateWindow);</div><div class='del'>-    if(activated)</div><div class='del'>-      gpilotd_conduit_mgmt_enable(conduit,pilotId,GnomePilotConduitSyncTypeSynchronize);</div><div class='del'>-    else</div><div class='del'>-      gpilotd_conduit_mgmt_disable(conduit,pilotId);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings(GtkWidget *widget, ConduitCfg *conduitCfg)</div><div class='del'>-{</div><div class='del'>-    doTrySettings(widget, conduitCfg);</div><div class='del'>-    save_configuration(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings(GtkWidget *widget, ConduitCfg *conduitCfg)</div><div class='del'>-{</div><div class='del'>-    activated = org_activation_state;</div><div class='del'>-    setStateCfg(cfgStateWindow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_dir_callback (GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		     gint len, gint *position, void *data)</div><div class='del'>-{</div><div class='del'>-    gint i;</div><div class='del'>-    gchar *curname;</div><div class='del'>-</div><div class='del'>-    curname = gtk_entry_get_text(GTK_ENTRY(editable));</div><div class='del'>-    if (*curname == '\0' &amp;&amp; len &gt; 0) {</div><div class='del'>-	if (isspace(text[0])) {</div><div class='del'>-	    gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");</div><div class='del'>-	    return;</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='del'>-	    if (isspace(text[i])) {</div><div class='del'>-		gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), </div><div class='del'>-					     "insert_text");</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'>-insert_dir_callback2(GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		      gint            length, gint           *position,</div><div class='del'>-		      void *data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-        capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clist_changed(GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-	capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-void about_cb (GtkWidget *widget, gpointer data) {</div><div class='del'>-  GtkWidget *about;</div><div class='del'>-  const gchar *authors[] = {_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"),NULL};</div><div class='del'>-  </div><div class='del'>-  about = gnome_about_new(_("Gpilotd todo conduit"), VERSION,</div><div class='del'>-			  _("(C) 1998 the Free Software Foundation"),</div><div class='del'>-			  authors,</div><div class='del'>-			  _("Configuration utility for the todo conduit.\n"),</div><div class='del'>-			  _("gnome-unknown.xpm"));</div><div class='del'>-  gtk_widget_show (about);</div><div class='del'>-  </div><div class='del'>-  return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void toggled_cb(GtkWidget *widget, gpointer data) {</div><div class='del'>-  gtk_widget_set_sensitive(cfgOptionsWindow,GTK_TOGGLE_BUTTON(widget)-&gt;active);</div><div class='del'>-  capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget</div><div class='del'>-*createStateCfgWindow(void)</div><div class='del'>-{</div><div class='del'>-    GtkWidget *vbox, *table;</div><div class='del'>-    GtkWidget *entry, *label;</div><div class='del'>-    GtkWidget *button;</div><div class='del'>-</div><div class='del'>-    vbox = gtk_vbox_new(FALSE, GNOME_PAD);</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_table_set_col_spacings(GTK_TABLE(table), 10);</div><div class='del'>-    gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-    label = gtk_label_new(_("Enabled"));</div><div class='del'>-    gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1,2);</div><div class='del'>-</div><div class='del'>-    button = gtk_check_button_new();</div><div class='del'>-    gtk_object_set_data(GTK_OBJECT(vbox), "conduit_on_off", button);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(button), "toggled",</div><div class='del'>-		       GTK_SIGNAL_FUNC(toggled_cb),</div><div class='del'>-		       NULL);</div><div class='del'>-    gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 1,2);</div><div class='del'>-</div><div class='del'>-    return vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg(GtkWidget *cfg)</div><div class='del'>-{</div><div class='del'>-    GtkWidget *button;</div><div class='del'>-    gchar num[40];</div><div class='del'>-</div><div class='del'>-    button = gtk_object_get_data(GTK_OBJECT(cfg), "conduit_on_off");</div><div class='del'>-</div><div class='del'>-    g_assert(button!=NULL);</div><div class='del'>-</div><div class='del'>-    ignore_changes = TRUE;</div><div class='del'>-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),activated);</div><div class='del'>-    gtk_widget_set_sensitive(cfgOptionsWindow,GTK_TOGGLE_BUTTON(button)-&gt;active);</div><div class='del'>-    ignore_changes = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-readStateCfg(GtkWidget *cfg)</div><div class='del'>-{</div><div class='del'>-  GtkWidget *button;</div><div class='del'>-</div><div class='del'>-  button  = gtk_object_get_data(GTK_OBJECT(cfg), "conduit_on_off");</div><div class='del'>-  </div><div class='del'>-  g_assert(button!=NULL);</div><div class='del'>-</div><div class='del'>-  activated = GTK_TOGGLE_BUTTON(button)-&gt;active;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pilot_capplet_setup(void)</div><div class='del'>-{</div><div class='del'>-    GtkWidget *frame, *table;</div><div class='del'>-</div><div class='del'>-    capplet = capplet_widget_new();</div><div class='del'>-</div><div class='del'>-    table = gtk_table_new(1, 2, FALSE);</div><div class='del'>-    gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);</div><div class='del'>-    gtk_container_add(GTK_CONTAINER(capplet), table); </div><div class='del'>-</div><div class='del'>-    frame = gtk_frame_new(_("Conduit state"));</div><div class='del'>-    gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);</div><div class='del'>-    gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);</div><div class='del'>-    cfgStateWindow = createStateCfgWindow();</div><div class='del'>-    gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);</div><div class='del'>-</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "try",</div><div class='del'>-			GTK_SIGNAL_FUNC(doTrySettings), NULL);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			GTK_SIGNAL_FUNC(doRevertSettings), NULL);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			GTK_SIGNAL_FUNC(doSaveSettings), NULL);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			GTK_SIGNAL_FUNC(about_cb), NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    setStateCfg(cfgStateWindow);</div><div class='del'>-</div><div class='del'>-    gtk_widget_show_all(capplet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void run_error_dialog(gchar *mesg,...) {</div><div class='del'>-  char tmp[80];</div><div class='del'>-  va_list ap;</div><div class='del'>-</div><div class='del'>-  va_start(ap,mesg);</div><div class='del'>-  vsnprintf(tmp,79,mesg,ap);</div><div class='del'>-  dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);</div><div class='del'>-  gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));</div><div class='del'>-  va_end(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint get_pilot_id_from_gpilotd() {</div><div class='del'>-	gint *pilots;</div><div class='del'>-	int i;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	gpilotd_get_pilot_ids(&amp;pilots);</div><div class='del'>-	if(pilots) {</div><div class='del'>-		while(pilots[i]!=-1) { g_message("pilot %d = \"%d\"",i,pilots[i]); i++; }</div><div class='del'>-		if(i==0) {</div><div class='del'>-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			if(i==1) </div><div class='del'>-				return pilots[0];</div><div class='del'>-			else {</div><div class='del'>-				g_message("too many pilots...");</div><div class='del'>-				return pilots[0];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-		return -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'>-    /* we're a capplet */</div><div class='del'>-    gnome_capplet_init ("todo conduit control applet", NULL, argc, argv, </div><div class='del'>-			NULL,</div><div class='del'>-			0, NULL);</div><div class='del'>-</div><div class='del'>-    /* put all code to set things up in here */</div><div class='del'>-    conduit = gpilotd_conduit_mgmt_new("todo_conduit");</div><div class='del'>-</div><div class='del'>-    /* get pilot name from gpilotd */</div><div class='del'>-    /* 1. initialize the gpilotd connection */</div><div class='del'>-    if (gpilotd_init(&amp;argc,argv)!=0) {</div><div class='del'>-	    run_error_dialog(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-	    g_error(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-	    return -1;</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    /* 2 connect to gpilotd */</div><div class='del'>-    if (gpilotd_connect()!=0) {</div><div class='del'>-	    run_error_dialog(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-	    g_error(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-	    return -1;</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    pilotId = get_pilot_id_from_gpilotd();</div><div class='del'>-    if(!pilotId) return -1;</div><div class='del'>-    org_activation_state = activated = gpilotd_conduit_mgmt_is_enabled(conduit,pilotId);</div><div class='del'>-    </div><div class='del'>-    pilot_capplet_setup();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    /* done setting up, now run main loop */</div><div class='del'>-    capplet_gtk_main();</div><div class='del'>-    return 0;</div><div class='del'>-}    </div><div class='head'>diff --git a/calendar/conduits/todo/todo-conduit-control-applet.desktop b/calendar/conduits/todo/todo-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index a817e16843..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit-control-applet.desktop?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/todo/todo-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Todo conduit </div><div class='del'>-Name[da]=Udstående</div><div class='del'>-Name[no]=Oppgaver</div><div class='del'>-Comment=Configure the todo conduit</div><div class='del'>-Comment[da]=Konfigurér Udstående</div><div class='del'>-Comment[no]=Konfigurér oppgavelisten</div><div class='del'>-Exec=todo-conduit-control-applet --cap-id=1</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</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 3a543816af..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/todo/todo-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,256 +0,0 @@</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</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-file.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;pi-version.h&gt;</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;utime.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-standard-abs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "todo-conduit.h"</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-load_records(GnomePilotConduit *c)</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'>-pre_sync(GnomePilotConduit *c, GnomePilotDBInfo *dbi) {</div><div class='del'>-  int l;</div><div class='del'>-  unsigned char *buf;</div><div class='del'>-</div><div class='del'>-  gtk_object_set_data(GTK_OBJECT(c),"dbinfo",dbi);</div><div class='del'>-  </div><div class='del'>-  load_records(c);</div><div class='del'>-</div><div class='del'>-  buf = (unsigned char*)g_malloc(0xffff);</div><div class='del'>-  if((l=dlp_ReadAppBlock(dbi-&gt;pilot_socket,dbi-&gt;db_handle,0,(unsigned char *)buf,0xffff))&lt;0) {</div><div class='del'>-    return -1;</div><div class='del'>-  }</div><div class='del'>-  unpack_ToDoAppInfo(&amp;(GET_DATA(c)-&gt;ai),buf,l);</div><div class='del'>-  g_free(buf);</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 *c) {</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match_record	(GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		 LocalRecord **local,</div><div class='del'>-		 PilotRecord *remote,</div><div class='del'>-		 gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("in match_record\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-free_match	(GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		 LocalRecord **local,</div><div class='del'>-		 gpointer data)</div><div class='del'>-{</div><div class='del'>-        g_print ("entering free_match\n");</div><div class='del'>-        *local = NULL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-archive_local (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	       LocalRecord *local,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering archive_local\n");</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-archive_remote (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		LocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering archive_remote\n");</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-store_remote (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	      PilotRecord *remote,</div><div class='del'>-	      gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering store_remote\n");</div><div class='del'>-        g_print ("Rec:%s:\nLength:%d\n", remote-&gt;record, remote-&gt;length);</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-clear_status_archive_local (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-			    LocalRecord *local,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering clear_status_archive_local\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-iterate (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	 LocalRecord **local,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering iterate\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-iterate_specific (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		  LocalRecord **local,</div><div class='del'>-		  gint flag,</div><div class='del'>-		  gint archived,</div><div class='del'>-		  gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering iterate_specific\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-purge (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-       gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering purge\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-set_status (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	    LocalRecord *local,</div><div class='del'>-	    gint status,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering set_status\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-set_archived (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	      LocalRecord *local,</div><div class='del'>-	      gint archived,</div><div class='del'>-	      gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering set_archived\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	      LocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering set_pilot_id\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	 LocalRecord *local,</div><div class='del'>-	 PilotRecord *remote,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering compare\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-compare_backup (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		LocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering compare_backup\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-free_transmit (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	       LocalRecord *local,</div><div class='del'>-	       PilotRecord *remote,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering free_transmit\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-delete_all (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering delete_all\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static PilotRecord *</div><div class='del'>-transmit (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	  LocalRecord *local,</div><div class='del'>-	  gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering transmit\n");</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilotId)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	ConduitCfg *cfg;</div><div class='del'>-	ConduitData *cdata;</div><div class='del'>-</div><div class='del'>-	g_print ("creating our new conduit\n");</div><div class='del'>-	retval = gnome_pilot_conduit_standard_abs_new ("TodoDB", 0x0);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-	gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"todo");</div><div class='del'>-</div><div class='del'>-	cfg = g_new0(ConduitCfg,1);</div><div class='del'>-	g_assert(cfg != NULL);</div><div class='del'>-	gtk_object_set_data(retval,"conduit_cfg",cfg);</div><div class='del'>-</div><div class='del'>-	cdata = g_new0(ConduitData,1);</div><div class='del'>-	g_assert(cdata != NULL);</div><div class='del'>-	gtk_object_set_data(retval,"conduit_data",cdata);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, NULL);</div><div class='del'>-</div><div class='del'>-	load_configuration(&amp;cfg,pilotId);</div><div class='del'>-</div><div class='del'>-	return GNOME_PILOT_CONDUIT (retval);</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)</div><div class='del'>-{</div><div class='del'>-        ConduitCfg *cc;</div><div class='del'>-        cc = GET_CONFIG(conduit);</div><div class='del'>-        destroy_configuration(&amp;cc);</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h<br/>deleted file mode 100644<br/>index c224b2b1f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/conduits/todo/todo-conduit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#ifndef __TODO_CONDUIT_H__</div><div class='del'>-#define __TODO_CONDUIT_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;unistd.h&gt;</div><div class='del'>-#include &lt;pi-todo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _ConduitCfg ConduitCfg;</div><div class='del'>-</div><div class='del'>-struct _ConduitCfg {</div><div class='del'>-  gboolean open_secret;</div><div class='del'>-  guint32 pilotId;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define GET_CONFIG(c) ((ConduitCfg*)gtk_object_get_data(GTK_OBJECT(c),"conduit_cfg"))</div><div class='del'>-</div><div class='del'>-typedef struct _ConduitData ConduitData;</div><div class='del'>-</div><div class='del'>-struct _ConduitData {</div><div class='del'>-  struct ToDoAppInfo ai;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define GET_DATA(c) ((ConduitData*)gtk_object_get_data(GTK_OBJECT(c),"conduit_data"))</div><div class='del'>-</div><div class='del'>-static void load_configuration(ConduitCfg **c,guint32 pilotId) {</div><div class='del'>-  gchar prefix[256];</div><div class='del'>-  g_snprintf(prefix,255,"/gnome-pilot.d/todod-conduit/Pilot_%u/",pilotId);</div><div class='del'>-</div><div class='del'>-  *c = g_new0(ConduitCfg,1);</div><div class='del'>-  gnome_config_push_prefix(prefix);</div><div class='del'>-  (*c)-&gt;open_secret = gnome_config_get_bool("open secret=FALSE");</div><div class='del'>-  gnome_config_pop_prefix();</div><div class='del'>-</div><div class='del'>-  (*c)-&gt;pilotId = pilotId;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void save_configuration(ConduitCfg *c) {</div><div class='del'>-  gchar prefix[256];</div><div class='del'>-</div><div class='del'>-  g_snprintf(prefix,255,"/gnome-pilot.d/todo-conduit/Pilot_%u/",c-&gt;pilotId);</div><div class='del'>-</div><div class='del'>-  gnome_config_push_prefix(prefix);</div><div class='del'>-  gnome_config_set_bool("open secret",c-&gt;open_secret);</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 void destroy_configuration(ConduitCfg **c) {</div><div class='del'>-  g_free(*c);</div><div class='del'>-  *c = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif __TODO_CONDUIT_H__ </div><div class='head'>diff --git a/calendar/doc/.cvsignore b/calendar/doc/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/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/calendar/doc/C/.cvsignore b/calendar/doc/C/.cvsignore<br/>deleted file mode 100644<br/>index 93942d6aa5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/.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'>-gnomecal</div><div class='del'>-gnomecal.html</div><div class='del'>-gnomecal.junk</div><div class='head'>diff --git a/calendar/doc/C/Makefile.am b/calendar/doc/C/Makefile.am<br/>deleted file mode 100644<br/>index fbd3b63acf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-gnomecal_helpdir = $(datadir)/gnome/help/gnomecal/C</div><div class='del'>-</div><div class='del'>-gnomecal_help_DATA = 	\</div><div class='del'>-	gnomecal.html	\</div><div class='del'>-	topic.dat</div><div class='del'>-</div><div class='del'>-SGML_FILES =			\</div><div class='del'>-	gnomecal.sgml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	topic.dat		\</div><div class='del'>-	$(SGML_FILES)</div><div class='del'>-</div><div class='del'>-all: </div><div class='del'>-</div><div class='del'>-gnomecal.html: gnomecal/gnomecal.html</div><div class='del'>-	-cp gnomecal/gnomecal.html .</div><div class='del'>-</div><div class='del'>-gnomecal/gnomecal.html: $(SGML_FILES)</div><div class='del'>-	-db2html gnomecal.sgml</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	mkdir $(distdir)/gnomecal</div><div class='del'>-	-cp gnomecal/*.html gnomecal/*.css $(distdir)/gnomecal</div><div class='del'>-	-cp gnomecal.html $(distdir)</div><div class='del'>-	mkdir $(distdir)/images</div><div class='del'>-	-cp images/*.gif images/*.jpg $(distdir)/images</div><div class='del'>-</div><div class='del'>-install-data-local: gnomecal.html</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(gnomecal_helpdir)/images</div><div class='del'>-	-for file in $(srcdir)/gnomecal/*.html $(srcdir)/gnomecal/*.css; do \</div><div class='del'>-	basefile=`basename $$file`; \</div><div class='del'>-	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gnomecal_helpdir)/$$basefile; \</div><div class='del'>-	done</div><div class='del'>-	-for file in $(srcdir)/images/*.jpg $(srcdir)/images/*.gif; do \</div><div class='del'>-	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gnomecal_helpdir)/images;\</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-gnomecal.ps: gnomecal.sgml</div><div class='del'>-	-db2ps $&lt;</div><div class='del'>-</div><div class='del'>-gnomecal.rtf: gnomecal.sgml	</div><div class='del'>-	-db2rtf $&lt;</div><div class='del'>-</div><div class='head'>diff --git a/calendar/doc/C/gnomecal.sgml b/calendar/doc/C/gnomecal.sgml<br/>deleted file mode 100644<br/>index 00c9c8bb72..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/gnomecal.sgml?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/gnomecal.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,465 +0,0 @@</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="gnomecal"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;GNOME calendar user's manual&lt;/title&gt;</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Dave&lt;/firstname&gt; &lt;surname&gt;Mason&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;dcm@redhat.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; &lt;surname&gt;de Icaza</div><div class='del'>-	  Amozurrutia&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@gnu.org&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;copyright&gt;</div><div class='del'>-      &lt;year&gt;1998, 1999&lt;/year&gt; &lt;holder&gt;Miguel de Icaza, Dave Mason&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-    &lt;legalnotice&gt;</div><div class='del'>-      &lt;para&gt;This documentation is free software; you can redistribute</div><div class='del'>-	it and/or modify it under the terms of the GNU General Public</div><div class='del'>-	License as published by the Free Software Foundation; either</div><div class='del'>-	version 2 of the License, or (at your option) any later</div><div class='del'>-	version.&lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;para&gt;This program is distributed in the hope that it will be</div><div class='del'>-	useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='del'>-	warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-	See the GNU General Public License for more details.&lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;para&gt;You should have received a copy of the GNU General Public</div><div class='del'>-	License along with this program; if not, write to the Free</div><div class='del'>-	Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='del'>-	MA 02111-1307 USA&lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;para&gt;For more details see the file COPYING in the source</div><div class='del'>-	distribution of GNOME.&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;toc&gt;&lt;/toc&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="cmdline"&gt;</div><div class='del'>-    &lt;title&gt;Command line options&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The following command line options are recognized by the</div><div class='del'>-      &lt;filename&gt;gnomecal&lt;/filename&gt; program.  You can use these</div><div class='del'>-      options to alter the behaviour of the program or to quickly</div><div class='del'>-      query the program for appointments, and to do items from the</div><div class='del'>-      command line without requiring an X display.  These are useful</div><div class='del'>-      for example to include in scripts.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</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'>-            &lt;emphasis&gt;--events&lt;/emphasis&gt;.  Displays the events for the</div><div class='del'>-	    date specified (or today, if no date is specified).</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;emphasis&gt;--from DATE&lt;/emphasis&gt;.  Define the beginning of</div><div class='del'>-	    the range for the event display, or the startup day on the</div><div class='del'>-	    calenday views.  By default, the event will span the whole</div><div class='del'>-	    day specified in DATE.</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;emphasis&gt;--to DATE&lt;/emphasis&gt;.  Define the range end for</div><div class='del'>-	    the event display.  If this is not specified, it will</div><div class='del'>-	    default to the end of the day specified by the</div><div class='del'>-	    &lt;emphasis&gt;--from&lt;/emphasis&gt; option.</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;emphasis&gt;--file FILE&lt;/emphasis&gt;.  Set the calendar to the</div><div class='del'>-	    &lt;emphasis&gt;FILE&lt;/emphasis&gt; specified on the command line.</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;emphasis&gt;--todo&lt;/emphasis&gt;.  Dumps the to-do values to</div><div class='del'>-	    standard output.</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;emphasis&gt;--userfile&lt;/emphasis&gt;.  Use this if you want to</div><div class='del'>-            force the file to be loaded to be the default user's</div><div class='del'>-            calendar (this is the default, only used to override the</div><div class='del'>-            --file if you have some sort of macro.</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;emphasis&gt;--geometry&lt;/emphasis&gt;.  Used to specity the</div><div class='del'>-            startup geometry of the application (location and size).</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;emphasis&gt;--view VIEWMODE&lt;/emphasis&gt;.  Use this to specify</div><div class='del'>-            the startup view that should be used.</div><div class='del'>-            &lt;emphasis&gt;VIEWMODE&lt;/emphasis&gt; is one of: dayview,</div><div class='del'>-            weekview, monthview, yearview.</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;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &lt;emphasis&gt;DATE&lt;/emphasis&gt; is interpreted as being in the local</div><div class='del'>-      time-zone, unless a specific timezone is specified.  Examples</div><div class='del'>-      of valid date specifications include: "1 month ago", "2 hours</div><div class='del'>-      ago", "400000 seconds ago", "last year", "last Monday",</div><div class='del'>-      "yesterday", "a fortnight ago", "3/31/92 10:00:07 PST", "January</div><div class='del'>-      23, 1987 10:05pm", "22:00 GMT".  </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="tech.html"&gt;</div><div class='del'>-    &lt;title&gt;Technical information about the GNOME calendar&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Currently, the GNOME calendar uses the vCal file format standard </div><div class='del'>-      for storing and loading its appointment and todo database.  This</div><div class='del'>-      standard is widely used in various other calendar applications,</div><div class='del'>-      so it provides a good mechanism for exchanging appointments.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In the future the GNOME calendar will support the upcoming</div><div class='del'>-      iCalendar specification as well.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you want to know more about the vCal specification, you can</div><div class='del'>-      check the &lt;ulink url="http://www.imc.org" type=http&gt;Internet</div><div class='del'>-      Mail Consortium (http://www.imc.org)&lt;/ulink&gt; for the details.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>- &lt;chapter id="gcal"&gt;</div><div class='del'>-  &lt;title&gt;The GNOME Calendar&lt;/title&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-   &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-   &lt;indexterm&gt;</div><div class='del'>-    &lt;primary&gt;</div><div class='del'>-     GNOME Calendar</div><div class='del'>-    &lt;/primary&gt;</div><div class='del'>-   &lt;/indexterm&gt;</div><div class='del'>-   &lt;indexterm&gt;</div><div class='del'>-    &lt;primary&gt;</div><div class='del'>-     Calendar</div><div class='del'>-    &lt;/primary&gt;</div><div class='del'>-   &lt;/indexterm&gt;</div><div class='del'>-    The GNOME Calendar is a  simple calendar applications which can be quite </div><div class='del'>-    useful in your daily work. The Calendar, like much of GNOME, is in its </div><div class='del'>-    infancy and while it is a very useful application, there is some very </div><div class='del'>-    impressive functionality still to come like network shared calendar usage, </div><div class='del'>-    and syncing capability with Palm Pilots and other hand held PDAs. The</div><div class='del'>-    Calendar can be launched from the &lt;guimenu&gt;Applications&lt;/guimenu&gt; submenu of</div><div class='del'>-    the Main Menu.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    The Calendar is broken up into four main tabs: Day, Week, Month,</div><div class='del'>-    and Year. Each view allows you to view the respective time period</div><div class='del'>-    but will also allow you to schedule appointments from any one of</div><div class='del'>-    the tabs.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;figure&gt;</div><div class='del'>-     &lt;title&gt;The GNOME Calendar&lt;/title&gt;</div><div class='del'>-    &lt;screenshot&gt;</div><div class='del'>-     &lt;screeninfo&gt;The GNOME Calendar&lt;/screeninfo&gt;</div><div class='del'>-      &lt;Graphic Format="gif" Fileref="images/calday" srccredit="dcm"&gt;</div><div class='del'>-      &lt;/graphic&gt;</div><div class='del'>-    &lt;/screenshot&gt;</div><div class='del'>-    &lt;/figure&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="calsetup" &lt;title&gt;Setting Up the GNOME Calendar&lt;/title&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     The GNOME Calendar can be used in the state which it is shipped but there </div><div class='del'>-     are tools available to make sure it is setup the way you would like it to </div><div class='del'>-     be. The first place you should go is the GNOME Calendar Preferences. You </div><div class='del'>-     can find the Preferences dialog by selecting the </div><div class='del'>-     &lt;guimenuitem&gt;Preferences&lt;/guimenuitem&gt; menu item from the &lt;guimenu&gt; </div><div class='del'>-     Settings&lt;/guimenu&gt; menu.</div><div class='del'>-   &lt;figure&gt;</div><div class='del'>-    &lt;title&gt;The GNOME Calendar Preferences&lt;/title&gt;</div><div class='del'>-   &lt;screenshot&gt;</div><div class='del'>-    &lt;screeninfo&gt;The GNOME Calendar Preferences.&lt;/screeninfo&gt;</div><div class='del'>-    &lt;Graphic Format="gif" Fileref="images/cal-props" srccredit="dcm"&gt;</div><div class='del'>-    &lt;/graphic&gt;</div><div class='del'>-   &lt;/screenshot&gt;</div><div class='del'>-   &lt;/figure&gt;</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    The Calendar Preferences dialog is broken up into three tabs, Time display,</div><div class='del'>-    Colors, and Todo list.</div><div class='del'>-   &lt;/para&gt; </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-   Time - This tab is broken up into three main sections: Time format, Weeks </div><div class='del'>-   start on, and Day range.</div><div class='del'>-   &lt;/para&gt;  </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      Time format - This allows you to choose between a 12 or 24 hour format </div><div class='del'>-      clock.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      Weeks start on - This allows you to define what day your week will start </div><div class='del'>-      on, Sunday or Monday. This will affect how the calendar is laid out in the </div><div class='del'>-      Day and Week views.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      Day range - This section lets you choose what time your days will start </div><div class='del'>-      and end. Any hours outside the range selected will be shaded on your Day </div><div class='del'>-      view.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Colors - This tab allows you to change the default colors used in the </div><div class='del'>-    Calendar. There are seven color choices you can customize: Outline, </div><div class='del'>-    Headings, Empty days, Appointments, Highlighted day, Day numbers, and </div><div class='del'>-    Current day's number. Each choice has a small color selector box next to </div><div class='del'>-    it. When you press this box you will be given a color selector dialog in </div><div class='del'>-    which you can choose the color you want. Once you have selected a color the </div><div class='del'>-    small sample calendar on the right side of the tab will preview your choice.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Todo List - This tab allows you to define which columns will be shown in the</div><div class='del'>-    Todo List in the Day View. You can set the Summary, Due Date, and Priority</div><div class='del'>-    columns.</div><div class='del'>-   &lt;/para&gt;    </div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Once you have made the changes to the Calendar Preferences you may press the </div><div class='del'>-    &lt;guibutton&gt;Apply&lt;/guibutton&gt; button to apply them.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="caluse"&gt;</div><div class='del'>-   &lt;title&gt;Using the GNOME Calendar&lt;/title&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Using the GNOME Calendar is quite simple and most tasks can be performed </div><div class='del'>-    from any of the major views, Day, Week, Month or Year. Probably one of the </div><div class='del'>-    most important features to remember is that at any time you may right mouse </div><div class='del'>-    click on a particular day and add a new appointment. There are many other </div><div class='del'>-    features which will be described below in each of the major views.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-     &lt;sect2 id="calday"&gt;</div><div class='del'>-    &lt;title&gt;The Day View&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The Day tab is probably the most useful view in the GNOME Calendar as it </div><div class='del'>-     acts just as a day timer would. On the left of the tab is the hour listing </div><div class='del'>-     for the current day. The light grey coloring in the hour list separates the </div><div class='del'>-     work hours from the non-work hours. If you would like to change the work </div><div class='del'>-     hours displayed in light grey you can do so in &lt;xref </div><div class='del'>-     LinkEnd="calsetup"&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;figure&gt;</div><div class='del'>-     &lt;title&gt;The Day View&lt;/title&gt;</div><div class='del'>-      &lt;screenshot&gt;</div><div class='del'>-       &lt;screeninfo&gt;The Day View&lt;/screeninfo&gt;</div><div class='del'>-       &lt;Graphic Format="gif" Fileref="images/calday" srccredit="dcm"&gt;</div><div class='del'>-       &lt;/graphic&gt;</div><div class='del'>-      &lt;/screenshot&gt;</div><div class='del'>-    &lt;/figure&gt;</div><div class='del'>-    &lt;tip&gt;</div><div class='del'>-     &lt;title&gt;TIP&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      One tip for adding a new appointment in the Day View is to select a few </div><div class='del'>-      hours in the hours list by clicking and dragging your mouse down the hours </div><div class='del'>-      list. Once the correct range of time has been selected you may press Enter</div><div class='del'>-      and type in the appointment. This will allow you to skip the Create New</div><div class='del'>-      Appointment dialog.</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'>-     Next to the hours listing in the top right hand corner is a small full </div><div class='del'>-     month calendar. You may change the month or year of the small month </div><div class='del'>-     calendar by pressing the forward and backward arrows on the top. You may </div><div class='del'>-     use the small month calendar to navigate the days as well. Double clicking </div><div class='del'>-     on any day in the small month calendar will move the current day view to </div><div class='del'>-     that particular day.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Below the small month calendar is your Todo list. The Todo list is a </div><div class='del'>-     simple list where you can keep all your tasks on hand. To add an item to </div><div class='del'>-     the Todo list press the &lt;guibutton&gt;Add&lt;/guibutton&gt; button. This will </div><div class='del'>-     launch a small editing box where you can type in the item. Once you have </div><div class='del'>-     entered an item in the Todo list you may use the</div><div class='del'>-     &lt;guibutton&gt;Edit&lt;/guibutton&gt; and &lt;guibutton&gt;Delete&lt;/guibutton&gt; to manage </div><div class='del'>-     your items. The Todo items are available no matter which days are displayed </div><div class='del'>-     in the Day View and can only be deleted with the </div><div class='del'>-     &lt;guibutton&gt;Delete&lt;/guibutton&gt; button.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect2&gt;</div><div class='del'>-   &lt;sect2 id="calweek"&gt;</div><div class='del'>-    &lt;title&gt;The Week View&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The Week View shows the current week with detailed descriptions of your </div><div class='del'>-     appointments. If you would like to add an appointment for any of the days </div><div class='del'>-     in the week view you may right mouse click on the day and select the</div><div class='del'>-     &lt;guimenuitem&gt;New appointment&lt;/guimenuitem&gt; menu item from the </div><div class='del'>-     &lt;guimenu&gt;pop-up&lt;/guimenu&gt; menu. You may also use the week view to navigate </div><div class='del'>-     to particular days in the Day View. Double-click on any day in the Week</div><div class='del'>-     View and you will go to that day in the Day View.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;figure&gt;</div><div class='del'>-     &lt;title&gt;The Week View&lt;/title&gt;</div><div class='del'>-      &lt;screenshot&gt;</div><div class='del'>-       &lt;screeninfo&gt;The Week View&lt;/screeninfo&gt;</div><div class='del'>-       &lt;Graphic Format="gif" Fileref="images/calweek" srccredit="dcm"&gt;</div><div class='del'>-       &lt;/graphic&gt;</div><div class='del'>-      &lt;/screenshot&gt;</div><div class='del'>-    &lt;/figure&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In the lower left corner of the Week View there is a small month calendar.</div><div class='del'>-     You may change the month or year of the small month calendar by pressing </div><div class='del'>-     the forward and backward arrows on the top. You may use the small month </div><div class='del'>-     calendar to navigate the days as well. Double clicking on any day in the </div><div class='del'>-     small month calendar will move the current week view to that particular </div><div class='del'>-     week.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/sect2&gt;</div><div class='del'>-   &lt;sect2 id="calmonth"&gt;</div><div class='del'>-    &lt;title&gt;The Month View&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The Month View shows the entire month with brief detailed descriptions of</div><div class='del'>-     your appointments. The Month View makes use of the customized colors </div><div class='del'>-     available in the Calendar. You may read about how to set these colors in</div><div class='del'>-     &lt;xref Linkend="calsetup"&gt;. For any day with a brief description of an </div><div class='del'>-     appointment you may click on the day to display a detailed description of </div><div class='del'>-     the appointment in a pop-up window. If you would like to add an appointment</div><div class='del'>-     to a day in the Month View you may right mouse click on any day and select </div><div class='del'>-     the &lt;guimenuitem&gt;New Appointment in this day&lt;/guimenuitem&gt; item from the</div><div class='del'>-     &lt;guimenu&gt;pop-up&lt;/guimenu&gt; menu. You may use the items in the</div><div class='del'>-     &lt;guimenu&gt;pop-up&lt;/guimenu&gt; menu to navigate in the Day, Week, and Year views</div><div class='del'>-     by selecting either &lt;guimenuitem&gt;Jump to this day&lt;/guimenuitem&gt;, </div><div class='del'>-     &lt;guimenuitem&gt;Jump to this week&lt;/guimenuitem&gt;, or&lt;guimenuitem&gt;Jump to this </div><div class='del'>-     Year&lt;/guimenuitem&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;figure&gt;</div><div class='del'>-     &lt;title&gt;The Month View&lt;/title&gt;</div><div class='del'>-      &lt;screenshot&gt;</div><div class='del'>-       &lt;screeninfo&gt;The Month View&lt;/screeninfo&gt;</div><div class='del'>-       &lt;Graphic Format="gif" Fileref="images/calmonth" srccredit="dcm"&gt;</div><div class='del'>-       &lt;/graphic&gt;</div><div class='del'>-      &lt;/screenshot&gt;</div><div class='del'>-    &lt;/figure&gt;</div><div class='del'>-   &lt;/sect2&gt;</div><div class='del'>-   &lt;sect2 id="calyear"&gt;</div><div class='del'>-    &lt;title&gt;The Year View&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The Year View shows you the entire year with no descriptions of </div><div class='del'>-     appointments. Like the Month View, the Year View makes use of the </div><div class='del'>-     customized colors available in the Calendar. You may read about how to set</div><div class='del'>-     these colors in &lt;xref Linkend="calsetup"&gt;. If you have an appointment on a</div><div class='del'>-     day you may click on that day and a description of the appointment will be</div><div class='del'>-     displayed in the pop-up window. If you would like to add an appointment to</div><div class='del'>-     a day in the Year View you may right mouse click on any day and  select the</div><div class='del'>-     &lt;guimenuitem&gt;New Appointment in this day&lt;/guimenuitem&gt; item from the </div><div class='del'>-     &lt;guimenu&gt;pop-up&lt;/guimenu&gt; menu. You may use the items in the </div><div class='del'>-     &lt;guimenu&gt;pop-up&lt;/guimenu&gt; menu to navigate in the Day, Week, and Month </div><div class='del'>-     views by selecting either &lt;guimenuitem&gt;Jump to this day&lt;/guimenuitem&gt;, </div><div class='del'>-     &lt;guimenuitem&gt;Jump to this week&lt;/guimenuitem&gt;, or &lt;guimenuitem&gt;Jump to this </div><div class='del'>-     Month&lt;/guimenuitem&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;figure&gt;</div><div class='del'>-     &lt;title&gt;The Year View&lt;/title&gt;</div><div class='del'>-      &lt;screenshot&gt;</div><div class='del'>-       &lt;screeninfo&gt;The Year View&lt;/screeninfo&gt;</div><div class='del'>-       &lt;Graphic Format="gif" Fileref="images/calyear" srccredit="dcm"&gt;</div><div class='del'>-       &lt;/graphic&gt;</div><div class='del'>-      &lt;/screenshot&gt;</div><div class='del'>-    &lt;/figure&gt;</div><div class='del'>-   &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="calappoint"&gt;</div><div class='del'>-    &lt;title&gt;Making a New Appointment&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     There are many methods for making a new appointment in the GNOME Calendar,</div><div class='del'>-     the easiest is by pressing the &lt;guibutton&gt;New&lt;/guibutton&gt; button on the </div><div class='del'>-     button bar. Whenever you make a new appointment you will launch the Create</div><div class='del'>-     New Appointment dialog that allows you to set the properties of that</div><div class='del'>-     appointment. The Create New Appointment dialog is broken into two </div><div class='del'>-     different tabs, the General and the Recurrence tabs.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     General - The General tab is the area in which you specify the time of the</div><div class='del'>-     appointment and set reminders for yourself. There are four different areas</div><div class='del'>-     on the General tab: Summary, Time, Alarms, and Classification.</div><div class='del'>-     &lt;ITEMIZEDLIST MARK="bullet"&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        Summary - The Summary box allows you to type a description of the </div><div class='del'>-	appointment. Keep in mind that only a portion of this description will</div><div class='del'>-	be available in the Week and Month Views.</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'>-        Time - The Time area allows you to set the time range for the</div><div class='del'>-        appointment by selecting the date and hours. To the right of the start</div><div class='del'>-        and end days there is a small selection box named Calendar. This will</div><div class='del'>-	bring up a small Calendar when pressed. You may select the start and end</div><div class='del'>-	date in the small calendar. To the right of the  start en end hours </div><div class='del'>-	there is a small button which will display the hours of the day when</div><div class='del'>-        pressed. Each hour in the list will have a sub menu displaying each </div><div class='del'>-	quarter hour so you may select them. The hours are restricted to those</div><div class='del'>-	included in the Day Range.</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'>-        Alarms - The Alarms area allows you to set up an alarm to remind you of</div><div class='del'>-	an appointment. There are four different types of alarms you may use to</div><div class='del'>-	remind yourself of appointments: Display, Audio, Program, and Mail. The</div><div class='del'>-	Display alarm will display a message on your screen in the time you</div><div class='del'>-	set. The Audio alarm will play an audio file at the time you set. The </div><div class='del'>-	Program alarm will run a program you specify at the time you set. The</div><div class='del'>-	Mail alarm will send email to the user specified at the time you set.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-     &lt;!-- &lt;listitem&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        Classification - TO BE DONE</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt; --&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Recurrence - The Recurrence tab allows you to specify how often an </div><div class='del'>-     appointment should recur, if at all. The first property you should set if </div><div class='del'>-     you want a recurring appointment is the Recurrence rule. You may choose </div><div class='del'>-     among None, Daily, Weekly, Monthly, and Yearly. For each selection you may</div><div class='del'>-     adjust the recurrence properties for your selection. In the Ending date </div><div class='del'>-     area you may set a rule which will stop the recurrence of your appointment</div><div class='del'>-     or allow it to repeat forever. In the Exceptions area you may make</div><div class='del'>-     exceptions to the recurring appointment by double-clicking the date and</div><div class='del'>-     pressing the &lt;guibutton&gt;Add&lt;/guibutton&gt; button.</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'>-&lt;/book&gt;</div><div class='head'>diff --git a/calendar/doc/C/images/cal-props.gif b/calendar/doc/C/images/cal-props.gif<br/>deleted file mode 100644<br/>index 4a3ca0c706..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/images/cal-props.gif?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/images/cal-props.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/doc/C/images/calday.gif b/calendar/doc/C/images/calday.gif<br/>deleted file mode 100644<br/>index d708cbb2e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/images/calday.gif?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/images/calday.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/doc/C/images/calmonth.gif b/calendar/doc/C/images/calmonth.gif<br/>deleted file mode 100644<br/>index be20d3255c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/images/calmonth.gif?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/images/calmonth.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/doc/C/images/calweek.gif b/calendar/doc/C/images/calweek.gif<br/>deleted file mode 100644<br/>index 04820f9470..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/images/calweek.gif?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/images/calweek.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/doc/C/images/calyear.gif b/calendar/doc/C/images/calyear.gif<br/>deleted file mode 100644<br/>index 6e2333f419..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/images/calyear.gif?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/images/calyear.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/doc/C/topic.dat b/calendar/doc/C/topic.dat<br/>deleted file mode 100644<br/>index 23af169d62..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/C/topic.dat?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/C/topic.dat</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-gnomecal.html	Manual</div><div class='del'>-cmdline.html	Command line options </div><div class='head'>diff --git a/calendar/doc/Makefile.am b/calendar/doc/Makefile.am<br/>deleted file mode 100644<br/>index 42ffacc264..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/doc/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/doc/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = C</div><div class='head'>diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore<br/>deleted file mode 100644<br/>index c55e5d266f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +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'>-gncal</div><div class='del'>-evolution-calendar</div><div class='del'>-evolution-calendar.pure</div><div class='del'>-test-calendar-widget</div><div class='del'>-getdate.c</div><div class='del'>-GnomeCal-skels.c</div><div class='del'>-GnomeCal-common.c</div><div class='del'>-GnomeCal.h</div><div class='del'>-calendar-pilot-sync</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'>-GnomeCal-stubs.c</div><div class='del'>-*.lo</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 c8a4907854..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar.oaf.in?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GNOME_Evolution_Calendar.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:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</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:Bonobo/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 Evolution calendar component."/&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:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/GNOME_Evolution_Calendar.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo<br/>deleted file mode 100644<br/>index c8a4907854..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GNOME_Evolution_Calendar.oafinfo</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:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</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:Bonobo/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 Evolution calendar component."/&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:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in<br/>deleted file mode 100644<br/>index fb0f138caf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"</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:Bonobo/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 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:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"&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;/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_info&gt;</div><div class='head'>diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo<br/>deleted file mode 100644<br/>index fb0f138caf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"</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:Bonobo/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 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:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"&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;/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_info&gt;</div><div class='head'>diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in<br/>deleted file mode 100644<br/>index c8a4907854..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.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:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</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:Bonobo/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 Evolution calendar component."/&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:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo<br/>deleted file mode 100644<br/>index c8a4907854..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo</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:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</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:Bonobo/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 Evolution calendar component."/&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:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/GnomeCal.idl b/calendar/gui/GnomeCal.idl<br/>deleted file mode 100644<br/>index 3838c7c0bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GnomeCal.idl?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/GnomeCal.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-</div><div class='del'>-	module Calendar {</div><div class='del'>-		</div><div class='del'>-		interface Repository {</div><div class='del'>-</div><div class='del'>-			exception NotFound {};</div><div class='del'>-			typedef sequence&lt;string&gt; String_Sequence;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * get_object:</div><div class='del'>-			 * @uid: Unique Identifier for the object</div><div class='del'>-			 *</div><div class='del'>-			 * Returns a vCalendar object for the object</div><div class='del'>-			 * that matches the UID @uid.  </div><div class='del'>-			 */</div><div class='del'>-			string get_object    (in string uid)</div><div class='del'>-				raises (NotFound);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * get_object_by_pilot_id:</div><div class='del'>-			 * @pilot_id: the pilot id</div><div class='del'>-			 * </div><div class='del'>-			 * Returns the object that has the @pilot_id </div><div class='del'>-			 * identifier.</div><div class='del'>-			 */</div><div class='del'>-			string get_object_by_pilot_id (in long pilot_id) </div><div class='del'>-				raises (NotFound);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * get_id_from_pilot_id:</div><div class='del'>-			 * @pilot_id: the pilot id</div><div class='del'>-			 * </div><div class='del'>-			 * Returns the object id that matches the @pilot_id </div><div class='del'>-			 * identifier.</div><div class='del'>-			 */</div><div class='del'>-			string get_id_from_pilot_id (in long pilot_id)</div><div class='del'>-				raises (NotFound);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * delete_object:</div><div class='del'>-			 * @uid: Unique Identifier for the object</div><div class='del'>-			 */</div><div class='del'>-			void delete_object (in string uid)</div><div class='del'>-				raises (NotFound);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * update_object:</div><div class='del'>-			 * @uid: uid of object to update</div><div class='del'>-			 * @object: vcard object to update </div><div class='del'>-			 */</div><div class='del'>-			void update_object (in string uid, in string object);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * update_pilot_id:</div><div class='del'>-			 * @uid: Unique identifier for the event we want to update</div><div class='del'>-			 * @pilot_id: new ID assigned by the pilot</div><div class='del'>-			 * @pilot_status: Status to flag the event with</div><div class='del'>-			 */</div><div class='del'>-			void update_pilot_id (in string uid, in long pilot_id, in long pilot_status)</div><div class='del'>-				raises (NotFound);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * get_object_id_list</div><div class='del'>-			 *</div><div class='del'>-			 * Returns a sequence of the UID's of the entries</div><div class='del'>-			 */</div><div class='del'>-			String_Sequence get_object_id_list();</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * get_updated_objects:</div><div class='del'>-			 * </div><div class='del'>-			 * Returns a vCalendar with all the objects that have been</div><div class='del'>-			 * modified since the last Pilot Sync</div><div class='del'>-			 */</div><div class='del'>-			string get_updated_objects ();</div><div class='del'>-</div><div class='del'>-			/* </div><div class='del'>-			 * Returns the number of objects of a specific type in the calendar</div><div class='del'>-			 * repository. </div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			enum RecordStatus {</div><div class='del'>-				ANY,      /* This means all records */</div><div class='del'>-				NEW,</div><div class='del'>-				MODIFIED,</div><div class='del'>-				DELETED</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			long get_number_of_objects(in RecordStatus record_status);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * done:</div><div class='del'>-			 * </div><div class='del'>-			 * Informs the calendar that we are done using it,</div><div class='del'>-			 * gets a chance to destroy windows and save information.</div><div class='del'>-			 */</div><div class='del'>-			void done ();</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am<br/>deleted file mode 100644<br/>index 219003d780..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,139 +0,0 @@</div><div class='del'>-SUBDIRS = dialogs</div><div class='del'>-</div><div class='del'>-help_base = $(datadir)/gnome/help/cal</div><div class='del'>-</div><div class='del'>-CPPFLAGS =					\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"</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)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/widgets				\</div><div class='del'>-	-I$(includedir)					\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)			\</div><div class='del'>-	$(GNOME_CONDUIT_INCLUDEDIR)			\</div><div class='del'>-	$(PISOCK_INCLUDEDIR)                  		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"</div><div class='del'>-</div><div class='del'>-LINK_FLAGS =							\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)				\</div><div class='del'>-	$(INTLLIBS)						\</div><div class='del'>-	dialogs/libcal-dialogs.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)/e-util/libeutil.la			\</div><div class='del'>-	$(top_builddir)/widgets/e-paned/libepaned.a		\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a		\</div><div class='del'>-	$(top_builddir)/widgets/e-table/libetable.a		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la			\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical.a</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'>-	event-editor-dialog.glade</div><div class='del'>-</div><div class='del'>-glade_messages = event-editor-dialog.glade.h</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS = evolution-calendar</div><div class='del'>-</div><div class='del'>-evolution_calendar_SOURCES =			\</div><div class='del'>-	alarm.c					\</div><div class='del'>-	alarm.h					\</div><div class='del'>-	calendar-commands.c			\</div><div class='del'>-	calendar-commands.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-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-week-view-event-item.c		\</div><div class='del'>-	e-week-view-event-item.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'>-	event-editor.c				\</div><div class='del'>-	event-editor.h				\</div><div class='del'>-	getdate.y				\</div><div class='del'>-	gncal-todo.c				\</div><div class='del'>-	gncal-todo.h				\</div><div class='del'>-	gnome-month-item.c			\</div><div class='del'>-	gnome-month-item.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'>-	layout.c				\</div><div class='del'>-	layout.h				\</div><div class='del'>-	main.c					\</div><div class='del'>-	mark.c					\</div><div class='del'>-	mark.h					\</div><div class='del'>-	popup-menu.c				\</div><div class='del'>-	popup-menu.h				\</div><div class='del'>-	print.c					\</div><div class='del'>-	print.h					\</div><div class='del'>-	prop.c</div><div class='del'>-</div><div class='del'>-evolution_calendar_LDADD =					\</div><div class='del'>-	$(top_builddir)/shell/libeshell.a			\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)					\</div><div class='del'>-	$(BONOBO_HTML_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/widgets/e-text/libetext.a		\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(LINK_FLAGS)</div><div class='del'>-</div><div class='del'>-evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if USING_OAF</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo</div><div class='del'>-else</div><div class='del'>-gnorbadir = $(sysconfdir)/CORBA/servers</div><div class='del'>-gnorba_DATA = calendar-control.gnorba evolution-calendar.gnorba</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-OAF_GNORBA_EXTRAS = calendar-control.oafinfo evolution-calendar.oafinfo calendar-control.gnorba evolution-calendar.gnorba</div><div class='del'>-EXTRA_DIST =	 			\</div><div class='del'>-	$(OAF_GNORBA_EXTRAS)		\</div><div class='del'>-	$(glade_DATA)			\</div><div class='del'>-	bell.xpm			\</div><div class='del'>-	recur.xpm			\</div><div class='del'>-	jump.xpm			\</div><div class='del'>-	dayview.xpm			\</div><div class='del'>-	workweekview.xpm		\</div><div class='del'>-	weekview.xpm			\</div><div class='del'>-	monthview.xpm			\</div><div class='del'>-	yearview.xpm			\</div><div class='del'>-	calendar-control.gnorba		\</div><div class='del'>-	calendar-control.oafinfo</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C</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='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 931ab0bfac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify-dialog.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/alarm-notify/alarm-notify-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.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;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "alarm-notify-dialog.h"</div><div class='del'>-</div><div class='del'>-</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 *summary;</div><div class='del'>-	GtkWidget *snooze_time;</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'>-/**</div><div class='del'>- * alarm_notify_dialog:</div><div class='del'>- * @func: Function to be called when a dialog action is invoked.</div><div class='del'>- * @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, iCalObject *ico,</div><div class='del'>-		     AlarmNotifyFunc func, gpointer func_data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-	char buf[256];</div><div class='del'>-	struct tm tm_trigger;</div><div class='del'>-	struct tm tm_occur;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (trigger != -1, FALSE);</div><div class='del'>-	g_return_val_if_fail (occur != -1, FALSE);</div><div class='del'>-	g_return_val_if_fail (ico != 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;summary = glade_xml_get_widget (an-&gt;xml, "summary");</div><div class='del'>-	an-&gt;snooze_time = glade_xml_get_widget (an-&gt;xml, "snooze-time");</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;summary</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'>-	/* FIXME: use am_pm_flag or 24-hour time */</div><div class='del'>-</div><div class='del'>-	tm_trigger = *localtime (&amp;trigger);</div><div class='del'>-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &amp;tm_trigger);</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (an-&gt;dialog), buf);</div><div class='del'>-</div><div class='del'>-	/* Heading */</div><div class='del'>-</div><div class='del'>-	tm_occur = *localtime (&amp;occur);</div><div class='del'>-	strftime (buf, sizeof (buf),</div><div class='del'>-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),</div><div class='del'>-		  &amp;tm_occur);</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (an-&gt;heading), buf);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (an-&gt;summary), ico-&gt;summary);</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'>-	gtk_widget_show (an-&gt;dialog);</div><div class='del'>-	return TRUE;</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 770768f59c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify-dialog.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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/calobj.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, iCalObject *ico,</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.glade b/calendar/gui/alarm-notify/alarm-notify.glade<br/>deleted file mode 100644<br/>index 32d7e03f8b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/alarm-notify/alarm-notify.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;alarm-notify.glade.h&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;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;alarm-notify&lt;/name&gt;</div><div class='del'>-  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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'>-      &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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;summary&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;&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'>-      &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;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;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;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;label&gt;Close&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;snooze&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;label&gt;Snooze&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;edit&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;label&gt;Edit appointment&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'>-    &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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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.c b/calendar/gui/alarm-notify/alarm.c<br/>deleted file mode 100644<br/>index 20f64ffd75..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/alarm-notify/alarm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,305 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gnome.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;cal-util/calobj.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'>-/* The pipes used to notify about an alarm */</div><div class='del'>-static int alarm_pipes [2];</div><div class='del'>-</div><div class='del'>-/* The list of pending alarms */</div><div class='del'>-static GList *alarms;</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'>-</div><div class='del'>-</div><div class='del'>-/* SIGALRM handler.  Notifies the callback about the alarm. */</div><div class='del'>-static void</div><div class='del'>-alarm_signal (int arg)</div><div class='del'>-{</div><div class='del'>-	char c = 0;</div><div class='del'>-</div><div class='del'>-	write (alarm_pipes [1], &amp;c, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets up an itimer and returns a success code */</div><div class='del'>-static gboolean</div><div class='del'>-setup_itimer (time_t diff)</div><div class='del'>-{</div><div class='del'>-	struct itimerval itimer;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	itimer.it_interval.tv_sec = 0;</div><div class='del'>-	itimer.it_interval.tv_usec = 0;</div><div class='del'>-	itimer.it_value.tv_sec = diff;</div><div class='del'>-	itimer.it_value.tv_usec = 0;</div><div class='del'>-</div><div class='del'>-	v = setitimer (ITIMER_REAL, &amp;itimer, NULL);</div><div class='del'>-</div><div class='del'>-	return (v == 0) ? TRUE : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes the head alarm, returns it, and schedules the next alarm in the</div><div class='del'>- * queue.</div><div class='del'>- */</div><div class='del'>-static AlarmRecord *</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'>-	if (!alarms)</div><div class='del'>-		return 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'>-	if (alarms) {</div><div class='del'>-		time_t now;</div><div class='del'>-		AlarmRecord *new_ar;</div><div class='del'>-</div><div class='del'>-		now = time (NULL);</div><div class='del'>-		new_ar = alarms-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!setup_itimer (new_ar-&gt;trigger)) {</div><div class='del'>-			g_message ("pop_alarm(): Could not reset the timer!  "</div><div class='del'>-				   "Weird things will happen.");</div><div class='del'>-</div><div class='del'>-			/* FIXME: should we free the alarm list?  What</div><div class='del'>-			 * about further alarm removal requests that</div><div class='del'>-			 * will fail?</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct itimerval itimer;</div><div class='del'>-		int v;</div><div class='del'>-</div><div class='del'>-		itimer.it_interval.tv_sec = 0;</div><div class='del'>-		itimer.it_interval.tv_usec = 0;</div><div class='del'>-		itimer.it_value.tv_sec = 0;</div><div class='del'>-		itimer.it_value.tv_usec = 0;</div><div class='del'>-</div><div class='del'>-		v = setitimer (ITIMER_REAL, &amp;itimer, NULL);</div><div class='del'>-		if (v != 0)</div><div class='del'>-			g_message ("pop_alarm(): Could not clear the timer!  "</div><div class='del'>-				   "Weird things may happen.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ar;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Input handler for our own alarm notification pipe */</div><div class='del'>-static void</div><div class='del'>-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)</div><div class='del'>-{</div><div class='del'>-	AlarmRecord *ar;</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	if (read (alarm_pipes [0], &amp;c, 1) != 1) {</div><div class='del'>-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");</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'>-	ar = pop_alarm ();</div><div class='del'>-</div><div class='del'>-	g_message ("alarm_ready(): Notifying about alarm on %s", ctime (&amp;ar-&gt;trigger));</div><div class='del'>-</div><div class='del'>-	(* ar-&gt;alarm_fn) (ar, 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) (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'>-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 gboolean</div><div class='del'>-queue_alarm (time_t now, AlarmRecord *ar)</div><div class='del'>-{</div><div class='del'>-	time_t diff;</div><div class='del'>-	AlarmRecord *old_head;</div><div class='del'>-</div><div class='del'>-	if (alarms)</div><div class='del'>-		old_head = alarms-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		old_head = NULL;</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 TRUE;</div><div class='del'>-</div><div class='del'>-	/* Set the timer for removal upon activation */</div><div class='del'>-</div><div class='del'>-	diff = ar-&gt;trigger - now;</div><div class='del'>-	if (!setup_itimer (diff)) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");</div><div class='del'>-</div><div class='del'>-		l = g_list_find (alarms, ar);</div><div class='del'>-		g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-		alarms = g_list_remove_link (alarms, l);</div><div class='del'>-		g_list_free_1 (l);</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'>- * 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'>-	time_t now;</div><div class='del'>-	AlarmRecord *ar;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-	if (trigger &lt; now)</div><div class='del'>-		return 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'>-	g_message ("alarm_add(): Adding alarm for %s", ctime (&amp;trigger));</div><div class='del'>-</div><div class='del'>-	if (!queue_alarm (now, ar)) {</div><div class='del'>-		if (ar-&gt;destroy_notify_fn)</div><div class='del'>-			(* ar-&gt;destroy_notify_fn) (ar-&gt;data);</div><div class='del'>-</div><div class='del'>-		g_free (ar);</div><div class='del'>-		ar = NULL;</div><div class='del'>-	}</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 *ar;</div><div class='del'>-	AlarmRecord *old_head;</div><div class='del'>-	GList *l;</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'>-	if (old_head == ar)</div><div class='del'>-		pop_alarm ();</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'>-	if (ar-&gt;destroy_notify_fn)</div><div class='del'>-		(* ar-&gt;destroy_notify_fn) (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'>-/**</div><div class='del'>- * alarm_init:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Initializes the alarm notification system.  This must 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_init (void)</div><div class='del'>-{</div><div class='del'>-	struct sigaction sa;</div><div class='del'>-	int flags;</div><div class='del'>-</div><div class='del'>-	pipe (alarm_pipes);</div><div class='del'>-</div><div class='del'>-	/* set non blocking mode */</div><div class='del'>-	flags = 0;</div><div class='del'>-	fcntl (alarm_pipes [0], F_GETFL, &amp;flags);</div><div class='del'>-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);</div><div class='del'>-</div><div class='del'>-	/* Setup the signal handler */</div><div class='del'>-	sa.sa_handler = alarm_signal;</div><div class='del'>-	sigemptyset (&amp;sa.sa_mask);</div><div class='del'>-	sa.sa_flags = SA_RESTART;</div><div class='del'>-	sigaction (SIGALRM, &amp;sa, 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 2394d28024..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/alarm-notify/alarm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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'>-</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 data);</div><div class='del'>-</div><div class='del'>-void     alarm_init   (void);</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.c b/calendar/gui/alarm.c<br/>deleted file mode 100644<br/>index 20f64ffd75..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/alarm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,305 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gnome.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;cal-util/calobj.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'>-/* The pipes used to notify about an alarm */</div><div class='del'>-static int alarm_pipes [2];</div><div class='del'>-</div><div class='del'>-/* The list of pending alarms */</div><div class='del'>-static GList *alarms;</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'>-</div><div class='del'>-</div><div class='del'>-/* SIGALRM handler.  Notifies the callback about the alarm. */</div><div class='del'>-static void</div><div class='del'>-alarm_signal (int arg)</div><div class='del'>-{</div><div class='del'>-	char c = 0;</div><div class='del'>-</div><div class='del'>-	write (alarm_pipes [1], &amp;c, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets up an itimer and returns a success code */</div><div class='del'>-static gboolean</div><div class='del'>-setup_itimer (time_t diff)</div><div class='del'>-{</div><div class='del'>-	struct itimerval itimer;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	itimer.it_interval.tv_sec = 0;</div><div class='del'>-	itimer.it_interval.tv_usec = 0;</div><div class='del'>-	itimer.it_value.tv_sec = diff;</div><div class='del'>-	itimer.it_value.tv_usec = 0;</div><div class='del'>-</div><div class='del'>-	v = setitimer (ITIMER_REAL, &amp;itimer, NULL);</div><div class='del'>-</div><div class='del'>-	return (v == 0) ? TRUE : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes the head alarm, returns it, and schedules the next alarm in the</div><div class='del'>- * queue.</div><div class='del'>- */</div><div class='del'>-static AlarmRecord *</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'>-	if (!alarms)</div><div class='del'>-		return 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'>-	if (alarms) {</div><div class='del'>-		time_t now;</div><div class='del'>-		AlarmRecord *new_ar;</div><div class='del'>-</div><div class='del'>-		now = time (NULL);</div><div class='del'>-		new_ar = alarms-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!setup_itimer (new_ar-&gt;trigger)) {</div><div class='del'>-			g_message ("pop_alarm(): Could not reset the timer!  "</div><div class='del'>-				   "Weird things will happen.");</div><div class='del'>-</div><div class='del'>-			/* FIXME: should we free the alarm list?  What</div><div class='del'>-			 * about further alarm removal requests that</div><div class='del'>-			 * will fail?</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		struct itimerval itimer;</div><div class='del'>-		int v;</div><div class='del'>-</div><div class='del'>-		itimer.it_interval.tv_sec = 0;</div><div class='del'>-		itimer.it_interval.tv_usec = 0;</div><div class='del'>-		itimer.it_value.tv_sec = 0;</div><div class='del'>-		itimer.it_value.tv_usec = 0;</div><div class='del'>-</div><div class='del'>-		v = setitimer (ITIMER_REAL, &amp;itimer, NULL);</div><div class='del'>-		if (v != 0)</div><div class='del'>-			g_message ("pop_alarm(): Could not clear the timer!  "</div><div class='del'>-				   "Weird things may happen.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ar;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Input handler for our own alarm notification pipe */</div><div class='del'>-static void</div><div class='del'>-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)</div><div class='del'>-{</div><div class='del'>-	AlarmRecord *ar;</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	if (read (alarm_pipes [0], &amp;c, 1) != 1) {</div><div class='del'>-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");</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'>-	ar = pop_alarm ();</div><div class='del'>-</div><div class='del'>-	g_message ("alarm_ready(): Notifying about alarm on %s", ctime (&amp;ar-&gt;trigger));</div><div class='del'>-</div><div class='del'>-	(* ar-&gt;alarm_fn) (ar, 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) (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'>-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 gboolean</div><div class='del'>-queue_alarm (time_t now, AlarmRecord *ar)</div><div class='del'>-{</div><div class='del'>-	time_t diff;</div><div class='del'>-	AlarmRecord *old_head;</div><div class='del'>-</div><div class='del'>-	if (alarms)</div><div class='del'>-		old_head = alarms-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		old_head = NULL;</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 TRUE;</div><div class='del'>-</div><div class='del'>-	/* Set the timer for removal upon activation */</div><div class='del'>-</div><div class='del'>-	diff = ar-&gt;trigger - now;</div><div class='del'>-	if (!setup_itimer (diff)) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");</div><div class='del'>-</div><div class='del'>-		l = g_list_find (alarms, ar);</div><div class='del'>-		g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-		alarms = g_list_remove_link (alarms, l);</div><div class='del'>-		g_list_free_1 (l);</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'>- * 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'>-	time_t now;</div><div class='del'>-	AlarmRecord *ar;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-	if (trigger &lt; now)</div><div class='del'>-		return 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'>-	g_message ("alarm_add(): Adding alarm for %s", ctime (&amp;trigger));</div><div class='del'>-</div><div class='del'>-	if (!queue_alarm (now, ar)) {</div><div class='del'>-		if (ar-&gt;destroy_notify_fn)</div><div class='del'>-			(* ar-&gt;destroy_notify_fn) (ar-&gt;data);</div><div class='del'>-</div><div class='del'>-		g_free (ar);</div><div class='del'>-		ar = NULL;</div><div class='del'>-	}</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 *ar;</div><div class='del'>-	AlarmRecord *old_head;</div><div class='del'>-	GList *l;</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'>-	if (old_head == ar)</div><div class='del'>-		pop_alarm ();</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'>-	if (ar-&gt;destroy_notify_fn)</div><div class='del'>-		(* ar-&gt;destroy_notify_fn) (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'>-/**</div><div class='del'>- * alarm_init:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Initializes the alarm notification system.  This must 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_init (void)</div><div class='del'>-{</div><div class='del'>-	struct sigaction sa;</div><div class='del'>-	int flags;</div><div class='del'>-</div><div class='del'>-	pipe (alarm_pipes);</div><div class='del'>-</div><div class='del'>-	/* set non blocking mode */</div><div class='del'>-	flags = 0;</div><div class='del'>-	fcntl (alarm_pipes [0], F_GETFL, &amp;flags);</div><div class='del'>-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);</div><div class='del'>-</div><div class='del'>-	/* Setup the signal handler */</div><div class='del'>-	sa.sa_handler = alarm_signal;</div><div class='del'>-	sigemptyset (&amp;sa.sa_mask);</div><div class='del'>-	sa.sa_flags = SA_RESTART;</div><div class='del'>-	sigaction (SIGALRM, &amp;sa, NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h<br/>deleted file mode 100644<br/>index 2394d28024..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/alarm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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'>-</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 data);</div><div class='del'>-</div><div class='del'>-void     alarm_init   (void);</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/bell.xpm b/calendar/gui/bell.xpm<br/>deleted file mode 100644<br/>index b1ab537a17..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/bell.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/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/calendar/gui/cal_struct.h b/calendar/gui/cal_struct.h<br/>deleted file mode 100644<br/>index 411036c7aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/cal_struct.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/cal_struct.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-#define MAX_SZ 30</div><div class='del'>-</div><div class='del'>-enum RepeatType {</div><div class='del'>-	Single,</div><div class='del'>-	Days,</div><div class='del'>-	Months,</div><div class='del'>-	WeekDays,</div><div class='del'>-	MonthDays </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct actionitem {</div><div class='del'>-	char	date[MAX_SZ];</div><div class='del'>-	int	time;  /* Minutes past midnight */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct event {</div><div class='del'>-	struct actionitem start;</div><div class='del'>-	struct actionitem end;</div><div class='del'>-</div><div class='del'>-	enum RepeatType repeat;</div><div class='del'>-	int	repeatcount;</div><div class='del'>-	char	description[MAX_SZ];</div><div class='del'>-	char	subtype[MAX_SZ];</div><div class='del'>-	GList	*properties;</div><div class='del'>-};</div><div class='del'>-</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 dc74e20f00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-commands.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-commands.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,954 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Main file for the GNOME Calendar program</div><div class='del'>- * Copyright (C) 1998 the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *          Miguel de Icaza (miguel@kernel.org)</div><div class='del'>- *          Federico Mena (federico@helixcode.com)</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'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-</div><div class='del'>-#include "dayview.xpm"</div><div class='del'>-#include "workweekview.xpm"</div><div class='del'>-#include "weekview.xpm"</div><div class='del'>-#include "monthview.xpm"</div><div class='del'>-#include "yearview.xpm"</div><div class='del'>-</div><div class='del'>-/* The username, used to set the `owner' field of the event */</div><div class='del'>-char *user_name;</div><div class='del'>-</div><div class='del'>-/* The full user name from the Gecos field */</div><div class='del'>-char *full_name;</div><div class='del'>-</div><div class='del'>-/* a gnome-config string prefix that can be used to access the calendar config info */</div><div class='del'>-char *calendar_settings;</div><div class='del'>-</div><div class='del'>-/* Day begin, day end parameters */</div><div class='del'>-int day_begin, day_end;</div><div class='del'>-</div><div class='del'>-/* Whether weeks starts on Sunday or Monday */</div><div class='del'>-int week_starts_on_monday;</div><div class='del'>-</div><div class='del'>-/* If AM/PM indicators should be used. This may not be supported by the new</div><div class='del'>-   views. */</div><div class='del'>-int am_pm_flag = 0;</div><div class='del'>-</div><div class='del'>-/* The array of color properties -- keep in sync with the enumeration defined in main.h.  The color</div><div class='del'>- * values specified here are the defaults for the program.</div><div class='del'>- */</div><div class='del'>-struct color_prop color_props[] = {</div><div class='del'>-	{ 0x3e72, 0x35ec, 0x8ba2, N_("Outline:"),              "/calendar/Colors/outline" },</div><div class='del'>-	{ 0xffff, 0xffff, 0xffff, N_("Headings:"),             "/calendar/Colors/headings" },</div><div class='del'>-	{ 0xf26c, 0xecec, 0xbbe7, N_("Empty days:"),           "/calendar/Colors/empty_bg" },</div><div class='del'>-	{ 0xfc1e, 0xf87f, 0x5f80, N_("Appointments:"),         "/calendar/Colors/mark_bg" },</div><div class='del'>-	{ 0xd364, 0xc6b7, 0x7969, N_("Highlighted day:"),      "/calendar/Colors/prelight_bg" },</div><div class='del'>-	{ 0x01f0, 0x01f0, 0x01f0, N_("Day numbers:"),          "/calendar/Colors/day_fg" },</div><div class='del'>-	{ 0x0000, 0x0000, 0xffff, N_("Current day's number:"), "/calendar/Colors/current_fg" },</div><div class='del'>-	{ 0xbbbb, 0xbbbb, 0x0000, N_("To-Do item that is not yet due:"), "/calendar/Colors/todo_not_yet" },</div><div class='del'>-	{ 0xdddd, 0xbbbb, 0x0000, N_("To-Do item that is due today:"),   "/calendar/Colors/todo_today" },</div><div class='del'>-	{ 0xbbbb, 0xdddd, 0x0000, N_("To-Do item that is overdue:"),     "/calendar/Colors/todo_overdue" }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Number of active calendars */</div><div class='del'>-int active_calendars = 0;</div><div class='del'>-</div><div class='del'>-/* A list of all of the calendars started */</div><div class='del'>-GList *all_calendars = NULL;</div><div class='del'>-</div><div class='del'>-/* If set, beep on display alarms */</div><div class='del'>-gboolean beep_on_display = 0;</div><div class='del'>-</div><div class='del'>-/* If true, timeout the beeper on audio alarms */</div><div class='del'>-</div><div class='del'>-gboolean enable_aalarm_timeout = 0;</div><div class='del'>-guint audio_alarm_timeout = 0;</div><div class='del'>-const guint MAX_AALARM_TIMEOUT = 3600;</div><div class='del'>-const guint MAX_SNOOZE_SECS = 3600;</div><div class='del'>-gboolean enable_snooze = 0;</div><div class='del'>-guint snooze_secs = 60;</div><div class='del'>-</div><div class='del'>-/*extern CalendarAlarm alarm_defaults[4];*/</div><div class='del'>-CalendarAlarm alarm_defaults[4] = {</div><div class='del'>-        { ALARM_MAIL, 0, 15, ALARM_MINUTES },</div><div class='del'>-        { ALARM_PROGRAM, 0, 15, ALARM_MINUTES },</div><div class='del'>-        { ALARM_DISPLAY, 0, 15, ALARM_MINUTES },</div><div class='del'>-        { ALARM_AUDIO, 0, 15, ALARM_MINUTES }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void calendar_iterate_free_cache_entry	(gpointer	key,</div><div class='del'>-						 gpointer	value,</div><div class='del'>-						 gpointer	user_data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_username (void)</div><div class='del'>-{</div><div class='del'>-        user_name = g_strdup(g_get_user_name());</div><div class='del'>-        full_name = g_strdup(g_get_real_name());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-range_check_hour (int hour)</div><div class='del'>-{</div><div class='del'>-	if (hour &lt; 0)</div><div class='del'>-		hour = 0;</div><div class='del'>-	else if (hour &gt;= 24)</div><div class='del'>-		hour = 23;</div><div class='del'>-</div><div class='del'>-	return hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_default_alarms (void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	gboolean def;</div><div class='del'>-</div><div class='del'>-	alarm_defaults [ALARM_DISPLAY].type = ALARM_DISPLAY;</div><div class='del'>-	alarm_defaults [ALARM_AUDIO].type   = ALARM_AUDIO;</div><div class='del'>-	alarm_defaults [ALARM_PROGRAM].type = ALARM_PROGRAM;</div><div class='del'>-	alarm_defaults [ALARM_MAIL].type    = ALARM_MAIL;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		switch (alarm_defaults [i].type) {</div><div class='del'>-		case ALARM_DISPLAY:</div><div class='del'>-			gnome_config_push_prefix ("/calendar/alarms/def_disp_");</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_AUDIO:</div><div class='del'>-			gnome_config_push_prefix ("/calendar/alarms/def_audio_");</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_PROGRAM:</div><div class='del'>-			gnome_config_push_prefix ("/calendar/alarms/def_prog_");</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_MAIL:</div><div class='del'>-			gnome_config_push_prefix ("/calendar/alarms/def_mail_");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		alarm_defaults[i].enabled = gnome_config_get_int ("enabled=0");</div><div class='del'>-		if (alarm_defaults[i].type != ALARM_MAIL) {</div><div class='del'>-			alarm_defaults[i].count   = gnome_config_get_int ("count=15");</div><div class='del'>-			alarm_defaults[i].units   = gnome_config_get_int ("units=0");</div><div class='del'>-		} else {</div><div class='del'>-			alarm_defaults[i].count   = gnome_config_get_int ("count=1");</div><div class='del'>-			alarm_defaults[i].count   = gnome_config_get_int ("count=2");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		alarm_defaults[i].data = gnome_config_get_string_with_default ("data=",</div><div class='del'>-									       &amp;def);</div><div class='del'>-		if (def)</div><div class='del'>-			alarm_defaults[i].data = NULL;</div><div class='del'>-</div><div class='del'>-		gnome_config_pop_prefix ();</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'>-about_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-        GtkWidget *about;</div><div class='del'>-        const gchar *authors[] = {</div><div class='del'>-		"Miguel de Icaza (miguel@kernel.org)",</div><div class='del'>-		"Federico Mena (federico@gimp.org)",</div><div class='del'>-		"Arturo Espinosa (arturo@nuclecu.unam.mx)",</div><div class='del'>-		"Russell Steinthal (rms39@columbia.edu)",</div><div class='del'>-		NULL</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-        about = gnome_about_new (_("Gnome Calendar"), VERSION,</div><div class='del'>-				 "(C) 1998 the Free Software Foundation",</div><div class='del'>-				 authors,</div><div class='del'>-				 _("The GNOME personal calendar and schedule manager."),</div><div class='del'>-				 NULL);</div><div class='del'>-	gtk_window_set_modal (GTK_WINDOW (about), TRUE);</div><div class='del'>-	gnome_dialog_set_close (GNOME_DIALOG (about), TRUE);</div><div class='del'>-        gtk_widget_show (about);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-display_objedit (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;new = TRUE;</div><div class='del'>-	gnome_calendar_get_current_time_range (gcal, &amp;ico-&gt;dtstart,</div><div class='del'>-					       &amp;ico-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (gcal, ico);</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-display_objedit_today (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;new = TRUE;</div><div class='del'>-	ico-&gt;dtstart = time (NULL);</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;ico-&gt;dtstart);</div><div class='del'>-	tm.tm_hour++;</div><div class='del'>-	ico-&gt;dtend = mktime (&amp;tm);</div><div class='del'>-	if (ico-&gt;dtend == -1) {</div><div class='del'>-		g_message ("display_objedit_today(): mktime() generated -1 invalid time!");</div><div class='del'>-		ical_object_unref (ico);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (gcal, ico);</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-}</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'>-	const char *view;</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 = gnome_calendar_get_current_view_name (gcal);</div><div class='del'>-</div><div class='del'>-	if (strcmp (view, "dayview") == 0)</div><div class='del'>-		print_view = PRINT_VIEW_DAY;</div><div class='del'>-	else if (strcmp (view, "workweekview") == 0 || strcmp (view, "weekview") == 0)</div><div class='del'>-		print_view = PRINT_VIEW_WEEK;</div><div class='del'>-	else if (strcmp (view, "monthview") == 0)</div><div class='del'>-		print_view = PRINT_VIEW_MONTH;</div><div class='del'>-	else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		print_view = PRINT_VIEW_DAY;</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'>-/* Toolbar/Print callback */</div><div class='del'>-static void</div><div class='del'>-tb_print_cb (GtkWidget *widget, 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'>-	print (gcal, FALSE);</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 (BonoboUIHandler *uih, void *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'>-void</div><div class='del'>-time_format_changed (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_time_format_changed (GNOME_CALENDAR (l-&gt;data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-colors_changed (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_colors_changed (GNOME_CALENDAR (l-&gt;data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-todo_properties_changed(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_todo_properties_changed (GNOME_CALENDAR (l-&gt;data));</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 (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</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 (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</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'>-static void</div><div class='del'>-today_clicked (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</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'>-goto_clicked (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</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 (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	gnome_calendar_set_view (gcal, "dayview");</div><div class='del'>-	gtk_widget_grab_focus (gcal-&gt;day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_work_week_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	gnome_calendar_set_view (gcal, "workweekview");</div><div class='del'>-	gtk_widget_grab_focus (gcal-&gt;work_week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_week_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	gnome_calendar_set_view (gcal, "weekview");</div><div class='del'>-	gtk_widget_grab_focus (gcal-&gt;week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_month_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	gnome_calendar_set_view (gcal, "monthview");</div><div class='del'>-	gtk_widget_grab_focus (gcal-&gt;month_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-show_year_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	gnome_calendar_set_view (gcal, "yearview");</div><div class='del'>-	gtk_widget_grab_focus (gcal-&gt;year_view);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	new_calendar (full_name, NULL, NULL, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	all_calendars = g_list_remove (all_calendars, gcal);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (gcal));</div><div class='del'>-	active_calendars--;</div><div class='del'>-</div><div class='del'>-	if (active_calendars == 0)</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-quit_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	while (all_calendars){</div><div class='del'>-		GnomeCalendar *cal = GNOME_CALENDAR (all_calendars-&gt;data);</div><div class='del'>-</div><div class='del'>-		close_cmd (uih, cal, path);</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_ok (GtkWidget *widget, GtkFileSelection *fs)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *error_dialog;</div><div class='del'>-	int ret;</div><div class='del'>-	if(!g_file_exists (gtk_file_selection_get_filename (fs))) {</div><div class='del'>-		error_dialog = gnome_message_box_new (</div><div class='del'>-			_("File not found"),</div><div class='del'>-			GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			GNOME_STOCK_BUTTON_OK,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-		gnome_dialog_set_parent (GNOME_DIALOG (error_dialog), GTK_WINDOW (fs));</div><div class='del'>-		ret = gnome_dialog_run (GNOME_DIALOG (error_dialog));</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: find out who owns this calendar and use that name */</div><div class='del'>-#warning "FIXME: find out who owns this calendar and use that name"</div><div class='del'>-		/*</div><div class='del'>-		new_calendar ("Somebody", gtk_file_selection_get_filename (fs), NULL, NULL, FALSE);</div><div class='del'>-		*/</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (fs));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-open_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GtkFileSelection *fs;</div><div class='del'>-</div><div class='del'>-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Open calendar")));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (fs-&gt;ok_button), "clicked",</div><div class='del'>-			    (GtkSignalFunc) open_ok,</div><div class='del'>-			    fs);</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (fs-&gt;cancel_button), "clicked",</div><div class='del'>-				   (GtkSignalFunc) gtk_widget_destroy,</div><div class='del'>-				   GTK_OBJECT (fs));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (fs));</div><div class='del'>-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_ok (GtkWidget *widget, GtkFileSelection *fs)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	gchar *fname;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (gtk_object_get_user_data (GTK_OBJECT (fs)));</div><div class='del'>-	gtk_window_set_wmclass (GTK_WINDOW (gcal), "gnomecal", "gnomecal");</div><div class='del'>-</div><div class='del'>-	fname = g_strdup (gtk_file_selection_get_filename (fs));</div><div class='del'>-	g_free(fname);</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-close_save (GtkWidget *w)</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'>-save_as_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GtkFileSelection *fs;</div><div class='del'>-</div><div class='del'>-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save calendar")));</div><div class='del'>-	gtk_object_set_user_data (GTK_OBJECT (fs), user_data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (fs-&gt;ok_button), "clicked",</div><div class='del'>-			    (GtkSignalFunc) save_ok,</div><div class='del'>-			    fs);</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (fs-&gt;cancel_button), "clicked",</div><div class='del'>-				   (GtkSignalFunc) close_save,</div><div class='del'>-				   GTK_OBJECT (fs));</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (fs), "delete_event",</div><div class='del'>-				   GTK_SIGNAL_FUNC (close_save),</div><div class='del'>-				   GTK_OBJECT (fs));</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (fs));</div><div class='del'>-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me even more */</div><div class='del'>-	gtk_main ();</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (fs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-properties_cmd (BonoboUIHandler *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);</div><div class='del'>-	properties (GTK_WIDGET (gcal));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo gnome_toolbar_view_buttons [] = {</div><div class='del'>-	GNOMEUIINFO_RADIOITEM (N_("Day"),    N_("Show 1 day"),</div><div class='del'>-			       show_day_view_clicked,</div><div class='del'>-			       dayview_xpm),</div><div class='del'>-	GNOMEUIINFO_RADIOITEM (N_("5 Days"), N_("Show the working week"),</div><div class='del'>-			       show_work_week_view_clicked,</div><div class='del'>-			       workweekview_xpm),</div><div class='del'>-	GNOMEUIINFO_RADIOITEM (N_("Week"),   N_("Show 1 week"),</div><div class='del'>-			       show_week_view_clicked,</div><div class='del'>-			       weekview_xpm),</div><div class='del'>-	GNOMEUIINFO_RADIOITEM (N_("Month"),  N_("Show 1 month"),</div><div class='del'>-			       show_month_view_clicked,</div><div class='del'>-			       monthview_xpm),</div><div class='del'>-#if 0</div><div class='del'>-	GNOMEUIINFO_RADIOITEM (N_("Year"),   N_("Show 1 year"),</div><div class='del'>-			       show_year_view_clicked,</div><div class='del'>-			       yearview_xpm),</div><div class='del'>-#endif</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo calendar_toolbar [] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("New"), N_("Create a new appointment"), display_objedit, GNOME_STOCK_PIXMAP_NEW),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print this calendar"), tb_print_cb, GNOME_STOCK_PIXMAP_PRINT),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Prev"), N_("Go back in time"), previous_clicked, GNOME_STOCK_PIXMAP_BACK),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Today"), N_("Go to present time"), today_clicked, GNOME_STOCK_PIXMAP_HOME),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Next"), N_("Go forward in time"), next_clicked, GNOME_STOCK_PIXMAP_FORWARD),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Go to"), N_("Go to a specific date"), goto_clicked, GNOME_STOCK_PIXMAP_JUMP_TO),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_RADIOLIST (gnome_toolbar_view_buttons),</div><div class='del'>-</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Performs signal connection as appropriate for interpreters or native bindings */</div><div class='del'>-static void</div><div class='del'>-do_ui_signal_connect (GnomeUIInfo *uiinfo, gchar *signal_name, </div><div class='del'>-		      GnomeUIBuilderData *uibdata)</div><div class='del'>-{</div><div class='del'>-	if (uibdata-&gt;is_interp)</div><div class='del'>-		gtk_signal_connect_full (GTK_OBJECT (uiinfo-&gt;widget),</div><div class='del'>-				signal_name, NULL, uibdata-&gt;relay_func,</div><div class='del'>-				uibdata-&gt;data ?</div><div class='del'>-				uibdata-&gt;data : uiinfo-&gt;user_data,</div><div class='del'>-				uibdata-&gt;destroy_func, FALSE, FALSE);</div><div class='del'>-</div><div class='del'>-	else if (uiinfo-&gt;moreinfo)</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (uiinfo-&gt;widget),</div><div class='del'>-				signal_name, uiinfo-&gt;moreinfo, uibdata-&gt;data ?</div><div class='del'>-				uibdata-&gt;data : uiinfo-&gt;user_data);</div><div class='del'>-}</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 *cal)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIHandler  remote_uih;</div><div class='del'>-	GtkWidget *toolbar, *toolbar_frame;</div><div class='del'>-	GnomeUIBuilderData uibdata;</div><div class='del'>-	BonoboUIHandler *uih = bonobo_control_get_ui_handler (control);</div><div class='del'>-	gchar *page_name;</div><div class='del'>-	gint button, i;</div><div class='del'>-	g_assert (uih);</div><div class='del'>-</div><div class='del'>-	uibdata.connect_func = do_ui_signal_connect;</div><div class='del'>-	uibdata.data = cal;</div><div class='del'>-	uibdata.is_interp = FALSE;</div><div class='del'>-	uibdata.relay_func = NULL;</div><div class='del'>-	uibdata.destroy_func = NULL;</div><div class='del'>-</div><div class='del'>-	g_print ("In calendar_control_activate\n");</div><div class='del'>-</div><div class='del'>-	remote_uih = bonobo_control_get_remote_ui_handler (control);</div><div class='del'>-	bonobo_ui_handler_set_container (uih, remote_uih);</div><div class='del'>-</div><div class='del'>-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,</div><div class='del'>-				   GTK_TOOLBAR_BOTH);</div><div class='del'>-	gnome_app_fill_toolbar_custom (GTK_TOOLBAR (toolbar),</div><div class='del'>-				       calendar_toolbar, &amp;uibdata, </div><div class='del'>-				       /*app-&gt;accel_group*/ NULL);</div><div class='del'>-</div><div class='del'>-	/*gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));*/</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; GNOME_CALENDAR_NUM_VIEWS; i++)</div><div class='del'>-		cal-&gt;view_toolbar_buttons[i] = gnome_toolbar_view_buttons[i].widget;</div><div class='del'>-</div><div class='del'>-	/* Note that these indices should correspond with the button indices</div><div class='del'>-	   in gnome_toolbar_view_buttons. */</div><div class='del'>-	page_name = gnome_calendar_get_current_view_name (cal);</div><div class='del'>-	if (!strcmp (page_name, "dayview")) {</div><div class='del'>-		button = 0;</div><div class='del'>-	} else if (!strcmp (page_name, "workweekview")) {</div><div class='del'>-		button = 1;</div><div class='del'>-	} else if (!strcmp (page_name, "weekview")) {</div><div class='del'>-		button = 2;</div><div class='del'>-	} else if (!strcmp (page_name, "monthview")) {</div><div class='del'>-		button = 3;</div><div class='del'>-	} else if (!strcmp (page_name, "yearview")) {</div><div class='del'>-		button = 4;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Unknown calendar view: %s", page_name);</div><div class='del'>-		button = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cal-&gt;view_toolbar_buttons[button]), TRUE);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (toolbar);</div><div class='del'>-</div><div class='del'>-	toolbar_frame = gtk_frame_new (NULL);</div><div class='del'>-	gtk_frame_set_shadow_type (GTK_FRAME (toolbar_frame), GTK_SHADOW_OUT);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (toolbar_frame), toolbar);</div><div class='del'>-	gtk_widget_show (toolbar_frame);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (toolbar_frame);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_dock_add (uih, "/Toolbar",</div><div class='del'>-				    bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_control_new (toolbar_frame))),</div><div class='del'>-				    GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL,</div><div class='del'>-				    GNOME_DOCK_TOP,</div><div class='del'>-				    1, 1, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* file menu */</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/New/Calendar", N_("New Ca_lendar"),</div><div class='del'>-					 N_("Create a new calendar"),</div><div class='del'>-					 -1, BONOBO_UI_HANDLER_PIXMAP_NONE,</div><div class='del'>-					 NULL, 0, 0, new_calendar_cmd, cal);</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/Open/Calendar", N_("Open Ca_lendar"),</div><div class='del'>-					 N_("Open a calendar"), -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, open_calendar_cmd, cal);</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/Save Calendar As",</div><div class='del'>-					 N_("Save Calendar As"),</div><div class='del'>-					 N_("Save Calendar As"),</div><div class='del'>-					 -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, save_as_calendar_cmd, cal);</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/Print", N_("Print..."),</div><div class='del'>-					 N_("Print this calendar"), -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_STOCK,</div><div class='del'>-					 GNOME_STOCK_PIXMAP_PRINT,</div><div class='del'>-					 'p', GDK_CONTROL_MASK,</div><div class='del'>-					 file_print_cb, cal);</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/File/Close", N_("_Close Calendar"),</div><div class='del'>-					 N_("Close current calendar"),</div><div class='del'>-					 -1, BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, close_cmd, cal);</div><div class='del'>-	/*bonobo_ui_handler_menu_new_item (uih, "/File/Exit",</div><div class='del'>-					 N_("_Exit"), N_("Exit"),</div><div class='del'>-					 -1, BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, quit_cmd, cal);	*/</div><div class='del'>-</div><div class='del'>-	/* edit menu */</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/Edit/New Appointment",</div><div class='del'>-					 N_("_New appointment..."), N_("Create a new appointment"),</div><div class='del'>-					 -1, BONOBO_UI_HANDLER_PIXMAP_STOCK,</div><div class='del'>-					 GNOME_STOCK_MENU_NEW, 0, 0,</div><div class='del'>-					 display_objedit, cal);</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/Edit/New Appointment for today",</div><div class='del'>-					 N_("New appointment for _today..."),</div><div class='del'>-					 N_("Create a new appointment for today"),</div><div class='del'>-					 -1, BONOBO_UI_HANDLER_PIXMAP_STOCK,</div><div class='del'>-					 GNOME_STOCK_MENU_NEW, 0, 0,</div><div class='del'>-					 display_objedit_today, cal);</div><div class='del'>-</div><div class='del'>-	//bonobo_ui_handler_menu_new_separator (uih, "/Edit", -1);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih, "/Edit/Preferences",</div><div class='del'>-					 N_("Preferences"), N_("Preferences"),</div><div class='del'>-					 -1, BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, properties_cmd, cal);</div><div class='del'>-	/* help menu */</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_menu_new_item (uih,</div><div class='del'>-					 "/Help/About Calendar",</div><div class='del'>-					 N_("About Calendar"),</div><div class='del'>-					 N_("About Calendar"),</div><div class='del'>-					 -1,</div><div class='del'>-					 BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,</div><div class='del'>-					 0, 0, about_calendar_cmd, cal);</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_control_deactivate (BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandler *uih = bonobo_control_get_ui_handler (control);</div><div class='del'>-	g_assert (uih);</div><div class='del'>-</div><div class='del'>-	g_print ("In calendar_control_deactivate\n");</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_dock_remove (uih, "/Toolbar");</div><div class='del'>- 	bonobo_ui_handler_unset_container (uih);</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 gint</div><div class='del'>-calendar_close_event (GtkWidget *widget, GdkEvent *event, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	close_cmd (NULL, gcal, NULL);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomeCalendar *</div><div class='del'>-new_calendar (char *full_name, char *geometry, char *page, gboolean hidden)</div><div class='del'>-{</div><div class='del'>-	GtkWidget   *toplevel;</div><div class='del'>-	char        title[128];</div><div class='del'>-	int         xpos, ypos, width, height;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* i18n: This "%s%s" indicates possession. Languages where the order is</div><div class='del'>-	 * the inverse should translate it to "%2$s%1$s".</div><div class='del'>-	 */</div><div class='del'>-	g_snprintf(title, 128, _("%s%s"), full_name, _("'s calendar"));</div><div class='del'>-</div><div class='del'>-	toplevel = gnome_calendar_new (title);</div><div class='del'>-	    </div><div class='del'>-	if (gnome_parse_geometry (geometry, &amp;xpos, &amp;ypos, &amp;width, &amp;height)){</div><div class='del'>-		if (xpos != -1)</div><div class='del'>-			gtk_widget_set_uposition (toplevel, xpos, ypos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (page)</div><div class='del'>-		gnome_calendar_set_view (GNOME_CALENDAR (toplevel), page);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC(calendar_close_event), toplevel);</div><div class='del'>-</div><div class='del'>-	active_calendars++;</div><div class='del'>-	all_calendars = g_list_prepend (all_calendars, toplevel);</div><div class='del'>-</div><div class='del'>-	if (hidden){</div><div class='del'>-		GnomeWinState state;</div><div class='del'>-		</div><div class='del'>-		/* Realize the toplevel window to prevent a segfault */</div><div class='del'>-		gtk_widget_realize (toplevel);</div><div class='del'>-		state = gnome_win_hints_get_state (toplevel);</div><div class='del'>-</div><div class='del'>-		state |= WIN_STATE_MINIMIZED;</div><div class='del'>-		gnome_win_hints_set_state (toplevel, state);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show (toplevel);</div><div class='del'>-</div><div class='del'>-	return GNOME_CALENDAR (toplevel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file)</div><div class='del'>-{</div><div class='del'>-	gboolean    success;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal);</div><div class='del'>-	g_return_if_fail (calendar_file);</div><div class='del'>-</div><div class='del'>-	printf ("calendar_set_uri: calendar_file is '%s'\n", calendar_file);</div><div class='del'>-</div><div class='del'>-	success = gnome_calendar_open (gcal,</div><div class='del'>-				       calendar_file,</div><div class='del'>-				       CALENDAR_OPEN_OR_CREATE);</div><div class='del'>-</div><div class='del'>-	printf ("    load or create returned %d\n", success);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initializes the calendar internal variables, loads defaults</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-init_calendar (void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *cspec, *color;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	init_username ();</div><div class='del'>-	/*user_calendar_file = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/user-cal.vcf");*/</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (calendar_settings);</div><div class='del'>-</div><div class='del'>-	/* Read calendar settings */</div><div class='del'>-</div><div class='del'>-	day_begin  = range_check_hour (gnome_config_get_int  ("/calendar/Calendar/Day start=8"));</div><div class='del'>-	day_end    = range_check_hour (gnome_config_get_int  ("/calendar/Calendar/Day end=17"));</div><div class='del'>-	am_pm_flag = gnome_config_get_bool ("/calendar/Calendar/AM PM flag=0");</div><div class='del'>-	week_starts_on_monday = gnome_config_get_bool ("/calendar/Calendar/Week starts on Monday=0");</div><div class='del'>-</div><div class='del'>-	if (day_end &lt; day_begin){</div><div class='del'>-		day_begin = 8;</div><div class='del'>-		day_end   = 17;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Read color settings */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; COLOR_PROP_LAST; i++) {</div><div class='del'>-		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);</div><div class='del'>-		str = g_strconcat (color_props[i].key, "=", cspec, NULL);</div><div class='del'>-</div><div class='del'>-		color = gnome_config_get_string (str);</div><div class='del'>-		parse_color_spec (color, &amp;color_props[i].r, &amp;color_props[i].g, &amp;color_props[i].b);</div><div class='del'>-</div><div class='del'>-		g_free (str);</div><div class='del'>-		g_free (color);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read todolist settings */</div><div class='del'>-</div><div class='del'>-	todo_show_time_remaining = gnome_config_get_bool("/calendar/Todo/show_time_remain");</div><div class='del'>-	todo_show_due_date = gnome_config_get_bool("/calendar/Todo/show_due_date");</div><div class='del'>-</div><div class='del'>-	todo_item_dstatus_highlight_overdue = gnome_config_get_bool("/calendar/Todo/highlight_overdue");</div><div class='del'>-	</div><div class='del'>-	todo_item_dstatus_highlight_due_today = gnome_config_get_bool("/calendar/Todo/highlight_due_today");</div><div class='del'>-	</div><div class='del'>-	todo_item_dstatus_highlight_not_due_yet = gnome_config_get_bool("/calendar/Todo/highlight_not_due_yet");</div><div class='del'>-</div><div class='del'>-        todo_current_sort_column = gnome_config_get_int("/calendar/Todo/sort_column");</div><div class='del'>-	</div><div class='del'>-	todo_current_sort_type = gnome_config_get_int("/calendar/Todo/sort_type");</div><div class='del'>-	</div><div class='del'>-	todo_show_priority = gnome_config_get_bool("/calendar/Todo/show_priority");</div><div class='del'>-</div><div class='del'>-	/* read alarm settings */</div><div class='del'>-	beep_on_display = gnome_config_get_bool ("/calendar/alarms/beep_on_display=FALSE");</div><div class='del'>-	enable_aalarm_timeout = gnome_config_get_bool ("/calendar/alarms/enable_audio_timeout=FALSE");</div><div class='del'>-	audio_alarm_timeout = gnome_config_get_int ("/calendar/alarms/audio_alarm_timeout=60");</div><div class='del'>-	if (audio_alarm_timeout &lt; 1)</div><div class='del'>-		audio_alarm_timeout = 1;</div><div class='del'>-	if (audio_alarm_timeout &gt; MAX_AALARM_TIMEOUT)</div><div class='del'>-		audio_alarm_timeout = MAX_AALARM_TIMEOUT;</div><div class='del'>-	enable_snooze = gnome_config_get_bool ("/calendar/alarms/enable_snooze=FALSE");</div><div class='del'>-	snooze_secs = gnome_config_get_int ("/calendar/alarms/snooze_secs=300");</div><div class='del'>-	if (snooze_secs &lt; 1)</div><div class='del'>-		snooze_secs = 1;</div><div class='del'>-	if (snooze_secs &gt; MAX_SNOOZE_SECS)</div><div class='del'>-		snooze_secs = MAX_SNOOZE_SECS;</div><div class='del'>-</div><div class='del'>-	init_default_alarms ();</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	/* Done */</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME -- where should this go? */</div><div class='del'>-void</div><div class='del'>-calendar_iterate (GnomeCalendar *cal,</div><div class='del'>-		  time_t start, time_t end,</div><div class='del'>-		  calendarfn cb, void *closure)</div><div class='del'>-{</div><div class='del'>-	GList *l, *cois;</div><div class='del'>-	GHashTable *cache;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	CalObjInstance *coi;</div><div class='del'>-	char *uid;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	cois = cal_client_get_events_in_range (cal-&gt;client, start, end);</div><div class='del'>-</div><div class='del'>-	/* We use a hash table to keep a cache of uid-&gt;iCalObject, so for</div><div class='del'>-	   recurring events we only load and parse the objects once. */</div><div class='del'>-	cache = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	for (l = cois; l; l = l-&gt;next) {</div><div class='del'>-		coi = l-&gt;data;</div><div class='del'>-		uid = coi-&gt;uid;</div><div class='del'>-</div><div class='del'>-		ico = g_hash_table_lookup (cache, uid);</div><div class='del'>-		if (!ico) {</div><div class='del'>-			status = cal_client_get_object (cal-&gt;client, uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-			switch (status) {</div><div class='del'>-			case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-				g_hash_table_insert (cache, ico-&gt;uid, ico);</div><div class='del'>-				break;</div><div class='del'>-			case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-				printf ("calendar_iterate: syntax error uid=%s\n", uid);</div><div class='del'>-				break;</div><div class='del'>-			case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-				printf ("calendar_iterate: obj not found uid=%s\n", uid);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ico)</div><div class='del'>-			(*cb) (ico, coi-&gt;start, coi-&gt;end, closure);</div><div class='del'>-</div><div class='del'>-		g_free (uid);</div><div class='del'>-		g_free (coi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (cois);</div><div class='del'>-</div><div class='del'>-	/* We need to unref all the iCalObjects in the cache now. The callback</div><div class='del'>-	   function should have ref'd any of them it wants to keep. */</div><div class='del'>-	g_hash_table_foreach (cache, calendar_iterate_free_cache_entry, NULL);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_iterate_free_cache_entry	(gpointer	key,</div><div class='del'>-					 gpointer	value,</div><div class='del'>-					 gpointer	user_data)</div><div class='del'>-{</div><div class='del'>-	ical_object_unref ((iCalObject*) value);</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 a3e5f5393c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-commands.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-commands.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,129 +0,0 @@</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 &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-/* This enum and the following array define the color preferences */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	COLOR_PROP_OUTLINE_COLOR,	/* Color of calendar outline */</div><div class='del'>-	COLOR_PROP_HEADING_COLOR,	/* Color for headings */</div><div class='del'>-	COLOR_PROP_EMPTY_DAY_BG,	/* Background color for empty days */</div><div class='del'>-	COLOR_PROP_MARK_DAY_BG,		/* Background color for days with appointments */</div><div class='del'>-	COLOR_PROP_PRELIGHT_DAY_BG,	/* Background color for prelighted day */</div><div class='del'>-	COLOR_PROP_DAY_FG,		/* Color for day numbers */</div><div class='del'>-	COLOR_PROP_CURRENT_DAY_FG,	/* Color for current day's number */</div><div class='del'>-	COLOR_PROP_TODO_NOT_DUE_YET,    /* Color for Todo items not yet due */</div><div class='del'>-	COLOR_PROP_TODO_DUE_TODAY,      /* Color for Todo items due today */ </div><div class='del'>-	COLOR_PROP_TODO_OVERDUE,        /* Color for Todo items that are overdue */</div><div class='del'>-	COLOR_PROP_LAST			/* Number of color properties */</div><div class='del'>-} ColorProp;</div><div class='del'>-</div><div class='del'>-struct color_prop {</div><div class='del'>-	int r;		/* Values are in [0, 65535] */</div><div class='del'>-	int g;</div><div class='del'>-	int b;</div><div class='del'>-	char *label;	/* Label for properties dialog */</div><div class='del'>-	char *key;	/* Key for gnome_config */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct color_prop color_props[];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COOKIE_USER_HOME_DIR ((char *) -1)</div><div class='del'>-</div><div class='del'>- </div><div class='del'>-/* Calendar preferences */</div><div class='del'>-</div><div class='del'>-extern int day_begin, day_end;</div><div class='del'>-extern char *user_name;</div><div class='del'>-extern int am_pm_flag;</div><div class='del'>-extern int week_starts_on_monday;</div><div class='del'>-</div><div class='del'>-/* todo preferences */</div><div class='del'>-extern int todo_show_due_date;</div><div class='del'>-</div><div class='del'>-extern int todo_item_dstatus_highlight_overdue;</div><div class='del'>-extern int todo_item_dstatus_highlight_due_today;</div><div class='del'>-extern int todo_item_dstatus_highlight_not_due_yet;</div><div class='del'>-</div><div class='del'>-extern int todo_show_time_remaining;</div><div class='del'>-extern int todo_show_priority;</div><div class='del'>-extern char *todo_overdue_font_text;</div><div class='del'>-extern gboolean todo_style_changed;</div><div class='del'>-extern gint todo_current_sort_column;</div><div class='del'>-extern gint todo_current_sort_type;</div><div class='del'>-</div><div class='del'>-/* alarm stuff */</div><div class='del'>-extern CalendarAlarm alarm_defaults[4];</div><div class='del'>-extern gboolean beep_on_display;</div><div class='del'>-extern gboolean enable_aalarm_timeout;</div><div class='del'>-extern guint audio_alarm_timeout;</div><div class='del'>-extern const guint MAX_AALARM_TIMEOUT;</div><div class='del'>-extern gboolean enable_snooze;</div><div class='del'>-extern guint snooze_secs;</div><div class='del'>-extern const guint MAX_SNOOZE_SECS;</div><div class='del'>-</div><div class='del'>-/* Creates and runs the preferences dialog box */</div><div class='del'>-void properties (GtkWidget *toplevel);</div><div class='del'>-</div><div class='del'>-/* Asks for all the time-related displays to be updated when the user changes the time format</div><div class='del'>- * preferences.</div><div class='del'>- */</div><div class='del'>-void time_format_changed (void);</div><div class='del'>-</div><div class='del'>-/* Asks for all the month items' colors to be reset */</div><div class='del'>-void colors_changed (void);</div><div class='del'>-</div><div class='del'>-/* Asks for all todo lists to reflect the accurate properties */</div><div class='del'>-void todo_properties_changed(void);</div><div class='del'>-</div><div class='del'>-/* Creates and runs the Go-to date dialog */</div><div class='del'>-void goto_dialog (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Returns a pointer to a statically-allocated string with a representation of the specified color.</div><div class='del'>- * Values must be in [0, 65535].</div><div class='del'>- */</div><div class='del'>-char *build_color_spec (int r, int g, int b);</div><div class='del'>-</div><div class='del'>-/* Parses a color specification of the form "#%04x%04x%04x" and returns the color components. */</div><div class='del'>-void parse_color_spec (char *spec, int *r, int *g, int *b);</div><div class='del'>-</div><div class='del'>-/* Calls build_color_spec() for the color in the specified property number */</div><div class='del'>-char *color_spec_from_prop (ColorProp propnum);</div><div class='del'>-</div><div class='del'>-GnomeCalendar *new_calendar (char *full_name,</div><div class='del'>-			     char *geometry,</div><div class='del'>-			     char *page,</div><div class='del'>-			     gboolean hidden);</div><div class='del'>-</div><div class='del'>-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*----------------------------------------------------------------------*/</div><div class='del'>-/* FIXME -- where should this stuff go?                                 */</div><div class='del'>-/*----------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_iterate (GnomeCalendar *cal,</div><div class='del'>-		  time_t start, time_t end,</div><div class='del'>-		  calendarfn cb, void *closure);</div><div class='del'>-</div><div class='del'>-void init_calendar (void);</div><div class='del'>-</div><div class='del'>-void calendar_control_activate (BonoboControl *control,</div><div class='del'>-				GnomeCalendar *cal);</div><div class='del'>-void calendar_control_deactivate (BonoboControl *control);</div><div class='del'>-</div><div class='del'>-void quit_cmd (BonoboUIHandler *uih, void *user_data, const char *path);</div><div class='del'>-</div><div class='del'>-/*extern char *user_calendar_file;*/</div><div class='del'>-extern char *user_name;</div><div class='del'>-extern char *full_name;</div><div class='del'>-extern int debug_alarms;</div><div class='del'>-extern int active_calendars;</div><div class='del'>-extern GList *all_calendars;</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 1b178cfdfc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-component.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +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  Helix Code, 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 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: 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.h&gt;</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</div><div class='del'>-#else</div><div class='del'>-#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:evolution-calendar"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ "calendar", "evolution-calendar.png" },</div><div class='del'>-	{ NULL, NULL }</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'>-	     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") != 0)</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-</div><div class='del'>-	control = control_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'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      Evolution_Shell shell_interface)</div><div class='del'>-{</div><div class='del'>-	g_print ("evolution-calendar: Yeeeh! We have an owner!\n"); /* FIXME */</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 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'>-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL);</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'>-</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'>-	if (factory != NULL)</div><div class='del'>-		return;</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'>-		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 f83a849452..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-component.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-component.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'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Helix Code, 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 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: 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 /* _COMPONENT_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/calendar-conduit-control-applet.c b/calendar/gui/calendar-conduit-control-applet.c<br/>deleted file mode 100644<br/>index 2d6fb60ef5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-conduit-control-applet.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,360 +0,0 @@</div><div class='del'>-/* Control applet ("capplet") for the gnome-pilot calendar conduit,         */</div><div class='del'>-/* based on                                                                 */</div><div class='del'>-/* gpilotd control applet ('capplet') for use with the GNOME control center */</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;capplet-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gpilotd/gpilotd-conduit-mgmt.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app-dummy-callbacks.h&gt;</div><div class='del'>-</div><div class='del'>-#include "calendar-conduit.h"</div><div class='del'>-</div><div class='del'>-/* tell changes callbacks to ignore changes or not */</div><div class='del'>-static gboolean ignore_changes=FALSE;</div><div class='del'>-</div><div class='del'>-/* capplet widget */</div><div class='del'>-static GtkWidget *capplet=NULL;</div><div class='del'>-</div><div class='del'>-/* host/device/pilot configuration windows */</div><div class='del'>-GtkWidget *cfgOptionsWindow=NULL;</div><div class='del'>-GtkWidget *cfgStateWindow=NULL;</div><div class='del'>-GtkWidget *dialogWindow=NULL;</div><div class='del'>-</div><div class='del'>-GnomePilotConduitMgmt *conduit;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, gpointer);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, gpointer);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, gpointer);</div><div class='del'>-</div><div class='del'>-static void readStateCfg(GtkWidget *w,GCalConduitCfg *cfg);</div><div class='del'>-static void setStateCfg(GtkWidget *w,GCalConduitCfg *cfg);</div><div class='del'>-void about_cb (GtkWidget *, gpointer);</div><div class='del'>-GCalConduitCfg *origState = NULL;</div><div class='del'>-GCalConduitCfg *curState = NULL;</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-/* This array must be in the same order as enumerations</div><div class='del'>-   in GnomePilotConduitSyncType as they are used as index.</div><div class='del'>-   Custom type implies Disabled state.</div><div class='del'>-*/</div><div class='del'>-static gchar* sync_options[] ={ N_("Disabled"),</div><div class='del'>-				N_("Synchronize"),</div><div class='del'>-				N_("Copy From Pilot"),</div><div class='del'>-				N_("Copy To Pilot"),</div><div class='del'>-				N_("Merge From Pilot"),</div><div class='del'>-				N_("Merge To Pilot")};</div><div class='del'>-#define SYNC_OPTIONS_COUNT 6</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-setSettings(GCalConduitCfg* conduitCfg)</div><div class='del'>-{</div><div class='del'>-	if(conduitCfg-&gt;sync_type!=GnomePilotConduitSyncTypeCustom)</div><div class='del'>-		gpilotd_conduit_mgmt_enable_with_first_sync(conduit,pilotId,</div><div class='del'>-							    conduitCfg-&gt;sync_type,</div><div class='del'>-							    conduitCfg-&gt;sync_type,</div><div class='del'>-							    TRUE);</div><div class='del'>-	else</div><div class='del'>-		gpilotd_conduit_mgmt_disable(conduit,pilotId);</div><div class='del'>-</div><div class='del'>-	gcalconduit_save_configuration(conduitCfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doTrySettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	readStateCfg(cfgStateWindow,curState);</div><div class='del'>-	setSettings(curState);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	doTrySettings(widget,whatever);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doCancelSettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	setSettings(origState);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings(GtkWidget *widget, gpointer whatever)</div><div class='del'>-{</div><div class='del'>-	gcalconduit_destroy_configuration(&amp;curState);</div><div class='del'>-	curState = gcalconduit_dupe_configuration(origState);</div><div class='del'>-	setStateCfg(cfgStateWindow,curState);</div><div class='del'>-	setSettings(curState);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_dir_callback (GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		     gint len, gint *position, void *data)</div><div class='del'>-{</div><div class='del'>-    gint i;</div><div class='del'>-    gchar *curname;</div><div class='del'>-</div><div class='del'>-    curname = gtk_entry_get_text(GTK_ENTRY(editable));</div><div class='del'>-    if (*curname == '\0' &amp;&amp; len &gt; 0) {</div><div class='del'>-	if (isspace(text[0])) {</div><div class='del'>-	    gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");</div><div class='del'>-	    return;</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='del'>-	    if (isspace(text[i])) {</div><div class='del'>-		gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), </div><div class='del'>-					     "insert_text");</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'>-insert_dir_callback2(GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		      gint            length, gint           *position,</div><div class='del'>-		      void *data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-        capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clist_changed(GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-	capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-void about_cb (GtkWidget *widget, gpointer data) {</div><div class='del'>-  GtkWidget *about;</div><div class='del'>-  const gchar *authors[] = {_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"),NULL};</div><div class='del'>-  </div><div class='del'>-  about = gnome_about_new(_("GnomeCalendar Conduit"), VERSION,</div><div class='del'>-			  _("(C) 1998"),</div><div class='del'>-			  authors,</div><div class='del'>-			  _("Configuration utility for the calendar conduit.\n"),</div><div class='del'>-			  _("gnome-calendar-conduit.png"));</div><div class='del'>-  gtk_widget_show (about);</div><div class='del'>-  </div><div class='del'>-  return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void toggled_cb(GtkWidget *widget, gpointer data) {</div><div class='del'>-  capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by the sync_type GtkOptionMenu */</div><div class='del'>-static void</div><div class='del'>-sync_action_selection(GtkMenuShell *widget, gpointer unused) </div><div class='del'>-{</div><div class='del'>-	if (!ignore_changes) {</div><div class='del'>-		capplet_widget_state_changed(CAPPLET_WIDGET (capplet), TRUE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called by the sync_type GtkOptionMenu */</div><div class='del'>-static void</div><div class='del'>-activate_sync_type(GtkMenuItem *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	curState-&gt;sync_type = GPOINTER_TO_INT(data);</div><div class='del'>-	if(!ignore_changes)</div><div class='del'>-		capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget</div><div class='del'>-*createStateCfgWindow(void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vbox, *table;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *optionMenu,*menuItem;</div><div class='del'>-	GtkMenu   *menu;</div><div class='del'>-	gint i;</div><div class='del'>-	</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	table =  gtk_hbox_new(FALSE, 0); </div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new(_("Synchronize Action"));</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    </div><div class='del'>-</div><div class='del'>-	optionMenu=gtk_option_menu_new();</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);</div><div class='del'>-	menu = GTK_MENU(gtk_menu_new());</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;SYNC_OPTIONS_COUNT;i++) {</div><div class='del'>-		sync_options[i]=_(sync_options[i]);</div><div class='del'>-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);</div><div class='del'>-		gtk_widget_show(menuItem);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",</div><div class='del'>-				   GTK_SIGNAL_FUNC(activate_sync_type),</div><div class='del'>-				   GINT_TO_POINTER(i));</div><div class='del'>-		gtk_menu_append(menu,menuItem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(menu), "selection-done",</div><div class='del'>-			   GTK_SIGNAL_FUNC(sync_action_selection),</div><div class='del'>-			   NULL);</div><div class='del'>-  </div><div class='del'>-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    </div><div class='del'>-	</div><div class='del'>-	return vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg(GtkWidget *widget,GCalConduitCfg *cfg)</div><div class='del'>-{</div><div class='del'>-	GtkOptionMenu *optionMenu;</div><div class='del'>-	GtkMenu *menu;</div><div class='del'>-	</div><div class='del'>-	optionMenu = gtk_object_get_data(GTK_OBJECT(widget), "conduit_state");</div><div class='del'>-	g_assert(optionMenu!=NULL);</div><div class='del'>-	menu = GTK_MENU(gtk_option_menu_get_menu(optionMenu));</div><div class='del'>-</div><div class='del'>-  </div><div class='del'>-	ignore_changes = TRUE;</div><div class='del'>-	/* Here were are relying on the items in menu being the same </div><div class='del'>-	   order as in GnomePilotConduitSyncType. */</div><div class='del'>-	gtk_option_menu_set_history(optionMenu,(int)cfg-&gt;sync_type);</div><div class='del'>-	ignore_changes = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-readStateCfg(GtkWidget *w,GCalConduitCfg *cfg)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>-  GtkWidget *button;</div><div class='del'>-</div><div class='del'>-  button  = gtk_object_get_data(GTK_OBJECT(w), "conduit_on_off");</div><div class='del'>-  </div><div class='del'>-  g_assert(button!=NULL);</div><div class='del'>-</div><div class='del'>-  activated = GTK_TOGGLE_BUTTON(button)-&gt;active;</div><div class='del'>-*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pilot_capplet_setup(void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame, *table;</div><div class='del'>-</div><div class='del'>-	capplet = capplet_widget_new();</div><div class='del'>-</div><div class='del'>-	table = gtk_table_new(1, 2, FALSE);</div><div class='del'>-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(capplet), table); </div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new(_("Conduit state"));</div><div class='del'>-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);</div><div class='del'>-	cfgStateWindow = createStateCfgWindow();</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "try",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doTrySettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doRevertSettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doSaveSettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "cancel",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doCancelSettings), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			   GTK_SIGNAL_FUNC(about_cb), NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	setStateCfg(cfgStateWindow,curState);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all(capplet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-run_error_dialog(gchar *mesg,...) {</div><div class='del'>-	char tmp[80];</div><div class='del'>-	va_list ap;</div><div class='del'>-	</div><div class='del'>-	va_start(ap,mesg);</div><div class='del'>-	vsnprintf(tmp,79,mesg,ap);</div><div class='del'>-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);</div><div class='del'>-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));</div><div class='del'>-	va_end(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint get_pilot_id_from_gpilotd() {</div><div class='del'>-	gint *pilots;</div><div class='del'>-	int i;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	gpilotd_get_pilot_ids(&amp;pilots);</div><div class='del'>-	if(pilots) {</div><div class='del'>-		while(pilots[i]!=-1) { g_message("pilot %d = \"%d\"",i,pilots[i]); i++; }</div><div class='del'>-		if(i==0) {</div><div class='del'>-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			if(i==1) </div><div class='del'>-				return pilots[0];</div><div class='del'>-			else {</div><div class='del'>-				g_message("too many pilots...");</div><div class='del'>-				return pilots[0];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-		return -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'>-	/* we're a capplet */</div><div class='del'>-	gnome_capplet_init ("calendar conduit control applet", NULL, argc, argv, </div><div class='del'>-			    NULL,</div><div class='del'>-			    0, NULL);</div><div class='del'>-</div><div class='del'>-	/* get pilot name from gpilotd */</div><div class='del'>-	/* 1. initialize the gpilotd connection */</div><div class='del'>-	if (gpilotd_init(&amp;argc,argv)!=0) {</div><div class='del'>-		run_error_dialog(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-		g_error(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-    </div><div class='del'>-	/* 2 connect to gpilotd */</div><div class='del'>-	if (gpilotd_connect()!=0) {</div><div class='del'>-		run_error_dialog(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-		g_error(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-    </div><div class='del'>-	pilotId = get_pilot_id_from_gpilotd();</div><div class='del'>-	if(!pilotId) return -1;</div><div class='del'>-</div><div class='del'>-	/* put all code to set things up in here */</div><div class='del'>-	conduit = gpilotd_conduit_mgmt_new("calendar_conduit",pilotId);</div><div class='del'>-	gcalconduit_load_configuration(&amp;origState,pilotId);</div><div class='del'>-	gpilotd_conduit_mgmt_get_sync_type(conduit,pilotId,&amp;origState-&gt;sync_type);</div><div class='del'>-</div><div class='del'>-	curState = gcalconduit_dupe_configuration(origState);</div><div class='del'>-    </div><div class='del'>-	pilot_capplet_setup();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* done setting up, now run main loop */</div><div class='del'>-	capplet_gtk_main();</div><div class='del'>-	return 0;</div><div class='del'>-}    </div><div class='head'>diff --git a/calendar/gui/calendar-conduit-control-applet.desktop b/calendar/gui/calendar-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index 2a5af4f24e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-conduit-control-applet.desktop?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=GnomeCalendar</div><div class='del'>-Name[da]=Gnome kalender</div><div class='del'>-Name[no]=GNOME kalender</div><div class='del'>-Comment=Configure the GnomeCal conduit</div><div class='del'>-Comment[da]=Konfigurér GnomeCal-komponent</div><div class='del'>-Comment[no]=Konfigurér GnomeCal-komponent</div><div class='del'>-Exec=calendar-conduit-control-applet --cap-id=1</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</div><div class='del'>-Icon=gnome-calendar-conduit.png</div><div class='head'>diff --git a/calendar/gui/calendar-conduit.c b/calendar/gui/calendar-conduit.c<br/>deleted file mode 100644<br/>index 2cddd84186..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-conduit.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1406 +0,0 @@</div><div class='del'>-/* $Id$ */</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;utime.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;errno.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-file.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnome-factory.h&gt;</div><div class='del'>-#include &lt;pi-version.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-standard-abs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "GnomeCal.h"</div><div class='del'>-#include "calendar-conduit.h"</div><div class='del'>-</div><div class='del'>-int debug_alarms = 0;  /* needed to satisfy some other part of gncal */</div><div class='del'>-/* Default values for alarms */ /* needed to satisfy some other part of gncal */</div><div class='del'>-CalendarAlarm alarm_defaults[4] = {</div><div class='del'>-	{ ALARM_MAIL, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_PROGRAM, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_DISPLAY, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_AUDIO, 0, 15, ALARM_MINUTES }</div><div class='del'>-};</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'>-void local_record_from_icalobject(GCalLocalRecord *local,iCalObject *obj); </div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.8.11"</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 "gcalconduit" </div><div class='del'>-</div><div class='del'>-#define DEBUG_CALCONDUIT </div><div class='del'>-#undef DEBUG_CALCONDUIT</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-#define show_exception(e) g_warning ("Exception: %s\n", CORBA_exception_id (e))</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 show_exception(e)</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 catch_ret_val(_env,ret)                                                                 \</div><div class='del'>-  if (_env._major != CORBA_NO_EXCEPTION) {                                                      \</div><div class='del'>-        g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,"%s:%d: Caught exception",__FILE__,__LINE__);    \</div><div class='del'>-        g_warning ("Exception: %s\n", CORBA_exception_id (&amp;(_env)));                               \</div><div class='del'>-	CORBA_exception_free(&amp;(_env));                                                             \</div><div class='del'>-	return ret;                                                                             \</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_calendar_server (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		       GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail(conduit!=NULL,-2);</div><div class='del'>-	g_return_val_if_fail(ctxt!=NULL,-2);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;calendar = goad_server_activate_with_id (NULL, </div><div class='del'>-						       "IDL:GNOME:Calendar:Repository:1.0",</div><div class='del'>-						       0, NULL);</div><div class='del'>-	if (ctxt-&gt;calendar == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Can not communicate with GnomeCalendar server");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-  </div><div class='del'>-	if (ctxt-&gt;ev._major != CORBA_NO_EXCEPTION){</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev));</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'>-/* Just a stub to link with */</div><div class='del'>-void</div><div class='del'>-calendar_notify (time_t time, CalendarAlarm *which, void *data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GSList * </div><div class='del'>-get_calendar_objects(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		     gboolean *status,</div><div class='del'>-		     GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	GSList *result;</div><div class='del'>-	GNOME_Calendar_Repository_String_Sequence *uids;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(conduit!=NULL,NULL);</div><div class='del'>-	g_return_val_if_fail(ctxt!=NULL,NULL);</div><div class='del'>-</div><div class='del'>-	result = NULL;</div><div class='del'>-	uids = GNOME_Calendar_Repository_get_object_id_list (ctxt-&gt;calendar, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-  	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		if(status!=NULL) (*status) = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		if(status!=NULL) (*status) = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	if(status!=NULL) (*status) = TRUE;</div><div class='del'>-	if(uids-&gt;_length&gt;0) {</div><div class='del'>-		int i;</div><div class='del'>-		for(i=0;i&lt;uids-&gt;_length;i++) {</div><div class='del'>-			result = g_slist_prepend(result,g_strdup(uids-&gt;_buffer[i]));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		INFO ("No entries found");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_free(uids);</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'>-local_record_from_ical_uid(GCalLocalRecord *local,</div><div class='del'>-			   char *uid,</div><div class='del'>-			   GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	char *vcalendar_string;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-	</div><div class='del'>-	vcalendar_string = GNOME_Calendar_Repository_get_object(ctxt-&gt;calendar, uid, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-  	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} </div><div class='del'>-	g_return_if_fail(vcalendar_string!=NULL);</div><div class='del'>-	</div><div class='del'>-	obj = ical_object_new_from_string (vcalendar_string);</div><div class='del'>-</div><div class='del'>-	local_record_from_icalobject(local,obj);</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'>- * converts a iCalObject to a GCalLocalRecord</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-local_record_from_icalobject(GCalLocalRecord *local,</div><div class='del'>-			     iCalObject *obj) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(local!=NULL);</div><div class='del'>-	g_return_if_fail(obj!=NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;ical = obj;</div><div class='del'>-	local-&gt;local.ID = local-&gt;ical-&gt;pilot_id;</div><div class='del'>-  </div><div class='del'>-/*</div><div class='del'>-	LOG ("local-&gt;Id = %ld [%s], status = %d",</div><div class='del'>-		  local-&gt;local.ID,obj-&gt;summary,local-&gt;ical-&gt;pilot_status);</div><div class='del'>-*/</div><div class='del'>-	switch(local-&gt;ical-&gt;pilot_status) {</div><div class='del'>-	case ICAL_PILOT_SYNC_NONE: </div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing; </div><div class='del'>-		break;</div><div class='del'>-	case ICAL_PILOT_SYNC_MOD: </div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordModified; </div><div class='del'>-		break;</div><div class='del'>-	case ICAL_PILOT_SYNC_DEL: </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'>-	/* Records without a pilot_id are new */</div><div class='del'>-	if(local-&gt;local.ID == 0) </div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNew; </div><div class='del'>-  </div><div class='del'>-	local-&gt;local.secret = 0;</div><div class='del'>-	if(obj-&gt;class!=NULL) </div><div class='del'>-		if(strcmp(obj-&gt;class,"PRIVATE")==0)</div><div class='del'>-			local-&gt;local.secret = 1;</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'>-/*</div><div class='del'>- * Given a PilotRecord, find the matching record in</div><div class='del'>- * the calendar repository. If no match, return NULL</div><div class='del'>- */</div><div class='del'>-static GCalLocalRecord *</div><div class='del'>-find_record_in_repository(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-			  PilotRecord *remote,</div><div class='del'>-			  GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *vcal_string;</div><div class='del'>-	GCalLocalRecord *loc;</div><div class='del'>-  </div><div class='del'>-	g_return_val_if_fail(conduit!=NULL,NULL);</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,NULL);</div><div class='del'>-  </div><div class='del'>-	LOG ("requesting %ld", remote-&gt;ID);</div><div class='del'>-</div><div class='del'>-	vcal_string = </div><div class='del'>-		GNOME_Calendar_Repository_get_object_by_pilot_id (ctxt-&gt;calendar, remote-&gt;ID, &amp;(ctxt-&gt;ev));</div><div class='del'>-  </div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return NULL;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("Found");</div><div class='del'>-		loc = g_new0(GCalLocalRecord,1);</div><div class='del'>-		/* memory allocated in new_from_string is freed in free_match */</div><div class='del'>-		local_record_from_icalobject(loc,</div><div class='del'>-					     ical_object_new_from_string (vcal_string));</div><div class='del'>-		/* g_free(vcal_string); FIXME: this coredumps, but won't it leak without ? */</div><div class='del'>-		return loc;</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'>- * updates an given iCalObject in the repository</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-update_calendar_entry_in_repository(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-				    iCalObject *obj,</div><div class='del'>-				    GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(conduit!=NULL);</div><div class='del'>-	g_return_if_fail(obj!=NULL);</div><div class='del'>-</div><div class='del'>-	str = calendar_string_from_object (obj);</div><div class='del'>-  </div><div class='del'>-	GNOME_Calendar_Repository_update_object (ctxt-&gt;calendar, obj-&gt;uid, str, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-  	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return;</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static iCalObject *</div><div class='del'>-ical_from_remote_record(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-			PilotRecord *remote,</div><div class='del'>-			iCalObject *in_obj)</div><div class='del'>-{</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	int i;</div><div class='del'>-	struct Appointment a;</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_return_val_if_fail(remote!=NULL,NULL);</div><div class='del'>-	memset(&amp;a,0,sizeof(struct Appointment));</div><div class='del'>-	unpack_Appointment(&amp;a,remote-&gt;record,remote-&gt;length);</div><div class='del'>-	</div><div class='del'>-	if (in_obj == NULL)</div><div class='del'>-		obj = ical_new (a.note ? a.note : "",</div><div class='del'>-				g_get_user_name (),</div><div class='del'>-				a.description ? a.description : "");</div><div class='del'>-	else </div><div class='del'>-		obj = in_obj;</div><div class='del'>-	</div><div class='del'>-	if (a.note) {</div><div class='del'>-		g_free(obj-&gt;comment);</div><div class='del'>-		obj-&gt;comment = g_strdup(a.note);</div><div class='del'>-	}</div><div class='del'>-	if (a.description) {</div><div class='del'>-		g_free(obj-&gt;summary);</div><div class='del'>-		obj-&gt;summary = g_strdup(a.description);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	obj-&gt;created = now;</div><div class='del'>-	obj-&gt;last_mod = now;</div><div class='del'>-	obj-&gt;priority = 0;</div><div class='del'>-	obj-&gt;transp = 0;</div><div class='del'>-	obj-&gt;related = NULL;</div><div class='del'>-	obj-&gt;pilot_id = remote-&gt;ID;</div><div class='del'>-	obj-&gt;pilot_status = ICAL_PILOT_SYNC_NONE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Begin and end</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (a.event)</div><div class='del'>-	{</div><div class='del'>-		/* turn day-long events into a full day's appointment</div><div class='del'>-		   FIXME: get settings from gnomecal */</div><div class='del'>-		a.begin.tm_sec = 0;</div><div class='del'>-		a.begin.tm_min = 0;</div><div class='del'>-		a.begin.tm_hour = 0;</div><div class='del'>-</div><div class='del'>-		a.end.tm_sec = 0;</div><div class='del'>-		a.end.tm_min =59;</div><div class='del'>-		a.end.tm_hour = 23;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	obj-&gt;dtstart = mktime (&amp;a.begin);</div><div class='del'>-	obj-&gt;dtend = mktime (&amp;a.end);</div><div class='del'>-</div><div class='del'>-	/* Special case: daily repetitions are converted to a multi-day event */</div><div class='del'>-	/* This sucketh, a pilot event scheduled for dailyRepeat, freq 1, end on </div><div class='del'>-	   whatever is cleary converted wrong </div><div class='del'>-	if (a.repeatType == repeatDaily){</div><div class='del'>-		time_t newt = time_add_day (obj-&gt;dtend, a.repeatFrequency);</div><div class='del'>-</div><div class='del'>-		obj-&gt;dtend = newt;</div><div class='del'>-	}</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Alarm</div><div class='del'>-	 */</div><div class='del'>-	if (a.alarm){</div><div class='del'>-		obj-&gt;aalarm.type = ALARM_AUDIO;</div><div class='del'>-		obj-&gt;aalarm.enabled = 1;</div><div class='del'>-		obj-&gt;aalarm.count = a.advance;</div><div class='del'>-</div><div class='del'>-		switch (a.advanceUnits){</div><div class='del'>-		case advMinutes:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_MINUTES;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case advHours:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_HOURS;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case advDays:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_DAYS;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Recurrence</div><div class='del'>-	 */</div><div class='del'>-	if (a.repeatFrequency){</div><div class='del'>-		obj-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-		</div><div class='del'>-		switch (a.repeatType){</div><div class='del'>-		case repeatDaily:</div><div class='del'>-			/*</div><div class='del'>-			 * In the Pilot daily repetitions are actually</div><div class='del'>-			 * multi-day events</div><div class='del'>-			 */</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_DAILY;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatMonthlyByDate:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_MONTHLY_BY_DAY;</div><div class='del'>-			obj-&gt;recur-&gt;u.month_day = a.repeatFrequency;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatWeekly:</div><div class='del'>-		{</div><div class='del'>-			int wd;</div><div class='del'>-</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_WEEKLY;</div><div class='del'>-			for (wd = 0; wd &lt; 7; wd++)</div><div class='del'>-				if (a.repeatDays [wd])</div><div class='del'>-					obj-&gt;recur-&gt;weekday |= 1 &lt;&lt; wd;</div><div class='del'>-</div><div class='del'>-			if (obj-&gt;recur-&gt;weekday == 0){</div><div class='del'>-				struct tm tm = *localtime (&amp;obj-&gt;dtstart);</div><div class='del'>-</div><div class='del'>-				obj-&gt;recur-&gt;weekday = 1 &lt;&lt; tm.tm_wday;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		case repeatMonthlyByDay:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_MONTHLY_BY_POS;</div><div class='del'>-			obj-&gt;recur-&gt;u.month_pos = a.repeatFrequency;</div><div class='del'>-			obj-&gt;recur-&gt;weekday = (a.repeatDay / 7);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatYearly:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_YEARLY_BY_DAY;</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 (a.repeatForever)</div><div class='del'>-			obj-&gt;recur-&gt;duration = 0;</div><div class='del'>-		else</div><div class='del'>-			obj-&gt;recur-&gt;_enddate = mktime (&amp;a.repeatEnd);</div><div class='del'>-</div><div class='del'>-		obj-&gt;recur-&gt;interval = a.repeatFrequency;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Load exception dates </div><div class='del'>-	 */</div><div class='del'>-	obj-&gt;exdate = NULL;</div><div class='del'>-	for (i = 0; i &lt; a.exceptions; i++){</div><div class='del'>-		time_t *t = g_new (time_t, 1);</div><div class='del'>-</div><div class='del'>-		*t = mktime (&amp;(a.exception [i]));</div><div class='del'>-		obj-&gt;exdate = g_list_prepend (obj-&gt;exdate, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (obj-&gt;class);</div><div class='del'>-	</div><div class='del'>-	if (remote-&gt;attr &amp; dlpRecAttrSecret)</div><div class='del'>-		obj-&gt;class = g_strdup ("PRIVATE");</div><div class='del'>-	else</div><div class='del'>-		obj-&gt;class = g_strdup ("PUBLIC");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	free_Appointment(&amp;a);</div><div class='del'>-</div><div class='del'>-	return obj;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Code blatantly stolen from</div><div class='del'>- * calendar-pilot-sync.c:</div><div class='del'>- *   </div><div class='del'>- * (C) 1999 International GNOME Support</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Miguel de Icaza (miguel@gnome-support.com)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-update_record (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	       PilotRecord *remote,</div><div class='del'>-	       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	char *vcal_string;</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	struct Appointment a;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	memset(&amp;a,0,sizeof(struct Appointment));</div><div class='del'>-	unpack_Appointment(&amp;a,remote-&gt;record,remote-&gt;length);</div><div class='del'>-	</div><div class='del'>-	obj = ical_new (a.note ? a.note : "",</div><div class='del'>-			g_get_user_name (),</div><div class='del'>-			a.description ? a.description : "");</div><div class='del'>-</div><div class='del'>-	LOG ("requesting %ld [%s]", remote-&gt;ID, a.description);</div><div class='del'>-	vcal_string = GNOME_Calendar_Repository_get_object_by_pilot_id (ctxt-&gt;calendar, remote-&gt;ID, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		LOG ("Object did not exist, creating a new one");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		ical_from_remote_record(conduit,remote,obj);</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-	        WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		ical_object_unref (obj); </div><div class='del'>-		free_Appointment(&amp;a);</div><div class='del'>-		return -1;</div><div class='del'>-	} else {</div><div class='del'>-	        LOG ("Found");</div><div class='del'>-		ical_object_unref (obj);</div><div class='del'>-		obj = ical_object_new_from_string (vcal_string);</div><div class='del'>-		ical_from_remote_record(conduit,remote,obj);</div><div class='del'>-		CORBA_free(vcal_string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* update record on server */</div><div class='del'>-	</div><div class='del'>-	update_calendar_entry_in_repository(conduit,obj,ctxt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Shutdown</div><div class='del'>-	 */</div><div class='del'>-	ical_object_unref (obj);</div><div class='del'>-	free_Appointment(&amp;a);</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'>-check_for_slow_setting(GnomePilotConduit *c, </div><div class='del'>-		       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CORBA_long entry_number;</div><div class='del'>-	entry_number = </div><div class='del'>-		GNOME_Calendar_Repository_get_number_of_objects(ctxt-&gt;calendar, </div><div class='del'>-								GNOME_Calendar_Repository_ANY,</div><div class='del'>-								&amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-	        WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-	} else {</div><div class='del'>-		LOG (_("Calendar holds %d entries"),entry_number);</div><div class='del'>-		/* If the local base is empty, do a slow sync */</div><div class='del'>-		if ( entry_number &lt;= 0) {</div><div class='del'>-			gnome_pilot_conduit_standard_set_slow(GNOME_PILOT_CONDUIT_STANDARD(c));</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'>-pre_sync(GnomePilotConduit *c, </div><div class='del'>-	 GnomePilotDBInfo *dbi,</div><div class='del'>-	 GCalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	int l;</div><div class='del'>-	gint num_records;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-  </div><div class='del'>-	g_message ("GnomeCal Conduit v.%s",CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;calendar = CORBA_OBJECT_NIL;</div><div class='del'>-	</div><div class='del'>-	if (start_calendar_server(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start gnomecal server"));</div><div class='del'>-		gnome_pilot_conduit_error(GNOME_PILOT_CONDUIT(c),</div><div class='del'>-					  _("Could not start gnomecal server"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-  </div><div class='del'>-	/* Set the counters for the progress bar crap */</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_ANY, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-							       num_records);</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_MODIFIED, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_updated_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-								       num_records);</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_NEW, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_new_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-								   num_records);</div><div class='del'>-	num_records = GNOME_Calendar_Repository_get_number_of_objects (ctxt-&gt;calendar, GNOME_Calendar_Repository_DELETED, &amp;(ctxt-&gt;ev));</div><div class='del'>-	catch_ret_val(ctxt-&gt;ev,-1);</div><div class='del'>-	gnome_pilot_conduit_standard_abs_set_num_deleted_local_records(GNOME_PILOT_CONDUIT_STANDARD_ABS(c),</div><div class='del'>-								       num_records);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(c),"dbinfo",dbi);</div><div class='del'>-  </div><div class='del'>-	/* load_records(c); */</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc(0xffff);</div><div class='del'>-	if((l=dlp_ReadAppBlock(dbi-&gt;pilot_socket,dbi-&gt;db_handle,0,(unsigned char *)buf,0xffff)) &lt; 0) {</div><div class='del'>-		WARN(_("Could not read pilot's DateBook application block"));</div><div class='del'>-		WARN("dlp_ReadAppBlock(...) = %d",l);</div><div class='del'>-		gnome_pilot_conduit_error(GNOME_PILOT_CONDUIT(c),</div><div class='del'>-			     _("Could not read pilot's DateBook application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_AppointmentAppInfo(&amp;(ctxt-&gt;ai),buf,l);</div><div class='del'>-	g_free(buf);</div><div class='del'>-</div><div class='del'>-	check_for_slow_setting(c,ctxt);</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'>- * Find (if possible) the local record which matches</div><div class='del'>- * the given PilotRecord.</div><div class='del'>- * if successfull, return non-zero and set *local to</div><div class='del'>- * a non-null value (the located local record),</div><div class='del'>- * otherwise return 0 and set *local = NULL;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match_record	(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		 GCalLocalRecord **local,</div><div class='del'>-		 PilotRecord *remote,</div><div class='del'>-		 GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("in match_record");</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 = find_record_in_repository(conduit,remote,ctxt);</div><div class='del'>-  </div><div class='del'>-	if (*local==NULL) return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Free the data allocated by a previous match_record call.</div><div class='del'>- * If successfull, return non-zero and ser *local=NULL, otherwise</div><div class='del'>- * return 0.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-free_match	(GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		 GCalLocalRecord **local,</div><div class='del'>-		 GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering free_match");</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!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	ical_object_unref (GCAL_LOCALRECORD(*local)-&gt;ical); </div><div class='del'>-	g_free(*local);</div><div class='del'>-	</div><div class='del'>-        *local = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  Move to archive and set status to Nothing</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-archive_local (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	       GCalLocalRecord *local,</div><div class='del'>-	       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering archive_local");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-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'>-  Store in archive and set status to Nothing</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-archive_remote (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		GCalLocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering archive_remote");</div><div class='del'>-</div><div class='del'>-        g_return_val_if_fail(remote!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-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'>-  Store and set status to Nothing</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-store_remote (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	      PilotRecord *remote,</div><div class='del'>-	      GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering store_remote");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,-1);</div><div class='del'>-	remote-&gt;attr = GnomePilotRecordNothing;</div><div class='del'>-</div><div class='del'>-	return update_record(conduit,remote,ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-clear_status_archive_local (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-			    GCalLocalRecord *local,</div><div class='del'>-			    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering clear_status_archive_local");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-</div><div class='del'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-iterate (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	 GCalLocalRecord **local,</div><div class='del'>-	 GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GSList *events,*iterator;</div><div class='del'>-	static int hest;</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 iteration");</div><div class='del'>-</div><div class='del'>-		events = get_calendar_objects(conduit,NULL,ctxt);</div><div class='del'>-		hest = 0;</div><div class='del'>-		</div><div class='del'>-		if(events!=NULL) {</div><div class='del'>-			LOG ("iterating over %d records",g_slist_length(events));</div><div class='del'>-			*local = g_new0(GCalLocalRecord,1);</div><div class='del'>-</div><div class='del'>-			local_record_from_ical_uid(*local,(gchar*)events-&gt;data,ctxt);</div><div class='del'>-			iterator = events;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*LOG ("continuing iteration");*/</div><div class='del'>-		hest++;</div><div class='del'>-		if(g_slist_next(iterator)==NULL) {</div><div class='del'>-			GSList *l;</div><div class='del'>-</div><div class='del'>-			LOG ("ending");</div><div class='del'>-			/** free stuff allocated for iteration */</div><div class='del'>-			g_free((*local));</div><div class='del'>-</div><div class='del'>-			LOG ("iterated over %d records",hest);</div><div class='del'>-			for(l=events;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(events);</div><div class='del'>-</div><div class='del'>-			/* ends iteration */</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		} else {</div><div class='del'>-			iterator = g_slist_next(iterator);</div><div class='del'>-			local_record_from_ical_uid(*local,(gchar*)(iterator-&gt;data),ctxt);</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 gint</div><div class='del'>-iterate_specific (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		  GCalLocalRecord **local,</div><div class='del'>-		  gint flag,</div><div class='del'>-		  gint archived,</div><div class='del'>-		  GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-	{</div><div class='del'>-		gchar *tmp;</div><div class='del'>-		switch (flag) {</div><div class='del'>-		case GnomePilotRecordNothing: tmp = g_strdup("RecordNothing"); break;</div><div class='del'>-		case GnomePilotRecordModified: tmp = g_strdup("RecordModified"); break;</div><div class='del'>-		case GnomePilotRecordNew: tmp = g_strdup("RecordNew"); break;</div><div class='del'>-		default: tmp = g_strdup_printf("0x%x",flag); break;</div><div class='del'>-		}</div><div class='del'>-		LOG ("entering iterate_specific(flag = %s)",tmp);</div><div class='del'>-		g_free(tmp);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	/* iterate until a record meets the criteria */</div><div class='del'>-	while(gnome_pilot_conduit_standard_abs_iterate(conduit,(LocalRecord**)local)) {</div><div class='del'>-		if((*local)==NULL) break;</div><div class='del'>-		if(archived &amp;&amp; ((*local)-&gt;local.archived==archived)) break;</div><div class='del'>-		if(((*local)-&gt;local.attr == flag)) break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (*local)==NULL?0:1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-purge (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering purge");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* HEST, gem posterne her */</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	    GCalLocalRecord *local,</div><div class='del'>-	    gint status,</div><div class='del'>-	    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering set_status(status=%d)",status);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-	</div><div class='del'>-	local-&gt;local.attr = status;</div><div class='del'>-	switch(status) {</div><div class='del'>-	case GnomePilotRecordPending:</div><div class='del'>-	case GnomePilotRecordNothing:</div><div class='del'>-		local-&gt;ical-&gt;pilot_status = ICAL_PILOT_SYNC_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case GnomePilotRecordDeleted:</div><div class='del'>-		break;</div><div class='del'>-	case GnomePilotRecordNew:</div><div class='del'>-	case GnomePilotRecordModified:</div><div class='del'>-		local-&gt;ical-&gt;pilot_status = ICAL_PILOT_SYNC_MOD;</div><div class='del'>-		break;	  </div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if ( status == GnomePilotRecordDeleted) {</div><div class='del'>-		GNOME_Calendar_Repository_delete_object(ctxt-&gt;calendar,local-&gt;ical-&gt;uid,&amp;(ctxt-&gt;ev));</div><div class='del'>-	} else {</div><div class='del'>-		GNOME_Calendar_Repository_update_pilot_id(ctxt-&gt;calendar,</div><div class='del'>-							  local-&gt;ical-&gt;uid,</div><div class='del'>-							  local-&gt;local.ID,</div><div class='del'>-							  local-&gt;ical-&gt;pilot_status,</div><div class='del'>-							  &amp;(ctxt-&gt;ev));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		LOG ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return -1;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </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 gint</div><div class='del'>-set_archived (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	      GCalLocalRecord *local,</div><div class='del'>-	      gint archived,</div><div class='del'>-	      GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering set_archived");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = archived;</div><div class='del'>-	update_calendar_entry_in_repository(conduit,local-&gt;ical,ctxt);</div><div class='del'>-	/* FIXME: This should move the entry into a speciel</div><div class='del'>-	   calendar file, eg. Archive, or (by config option), simply</div><div class='del'>-	   delete it */</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 (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	      GCalLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering set_pilot_id(id=%d)",ID);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(local!=NULL,-1);</div><div class='del'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;local.ID = ID;</div><div class='del'>-	local-&gt;ical-&gt;pilot_id = ID;</div><div class='del'>-	GNOME_Calendar_Repository_update_pilot_id(ctxt-&gt;calendar,</div><div class='del'>-						  local-&gt;ical-&gt;uid,</div><div class='del'>-						  local-&gt;local.ID,</div><div class='del'>-						  local-&gt;ical-&gt;pilot_status,</div><div class='del'>-						  &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		LOG ("Object did not exist");</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		return -1;</div><div class='del'>-	} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-		show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-		CORBA_exception_free(&amp;(ctxt-&gt;ev)); </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 gint</div><div class='del'>-transmit (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	  GCalLocalRecord *local,</div><div class='del'>-	  PilotRecord **remote,</div><div class='del'>-	  GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	PilotRecord *p;</div><div class='del'>-	int daycount;</div><div class='del'>-	</div><div class='del'>-	LOG ("entering transmit");</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'>-	g_assert(local-&gt;ical!=NULL);</div><div class='del'>-</div><div class='del'>-	p = g_new0(PilotRecord,1);</div><div class='del'>-</div><div class='del'>-	p-&gt;ID = local-&gt;local.ID;</div><div class='del'>-	p-&gt;attr = local-&gt;local.attr;</div><div class='del'>-	p-&gt;archived = local-&gt;local.archived;</div><div class='del'>-	p-&gt;secret = local-&gt;local.secret;</div><div class='del'>-</div><div class='del'>-	local-&gt;a = g_new0(struct Appointment,1);</div><div class='del'>-</div><div class='del'>-	local-&gt;a-&gt;event = 0; /* if no start time, leave at 1 */</div><div class='del'>-	local-&gt;a-&gt;begin = *localtime(&amp;local-&gt;ical-&gt;dtstart);</div><div class='del'>-	local-&gt;a-&gt;end = *localtime(&amp;local-&gt;ical-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	/* set the Audio Alarm  parameters */</div><div class='del'>-	if(local-&gt;ical-&gt;aalarm.enabled) {</div><div class='del'>-		local-&gt;a-&gt;alarm = 1;</div><div class='del'>-		local-&gt;a-&gt;advance = local-&gt;ical-&gt;aalarm.count;</div><div class='del'>-		switch(local-&gt;ical-&gt;aalarm.units) {</div><div class='del'>-		case ALARM_MINUTES:</div><div class='del'>-			local-&gt;a-&gt;advanceUnits = advMinutes;</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_HOURS:</div><div class='del'>-			local-&gt;a-&gt;advanceUnits = advHours;</div><div class='del'>-			break;</div><div class='del'>-		case ALARM_DAYS:</div><div class='del'>-			local-&gt;a-&gt;advanceUnits = advDays;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;a-&gt;alarm = 0;</div><div class='del'>-		local-&gt;a-&gt;advance = 0;</div><div class='del'>-		local-&gt;a-&gt;advanceUnits = advMinutes;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the recurrence parameters */</div><div class='del'>-	if (local-&gt;ical-&gt;recur != NULL) {</div><div class='del'>-		switch (local-&gt;ical-&gt;recur-&gt;type) {</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatDaily;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatWeekly;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_POS:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatMonthlyByDate;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatMonthlyByDay;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-			local-&gt;a-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;ical-&gt;recur-&gt;duration == 0) {</div><div class='del'>-			local-&gt;a-&gt;repeatForever = 1;</div><div class='del'>-		} else {</div><div class='del'>-			local-&gt;a-&gt;repeatForever = 0;</div><div class='del'>-			local-&gt;a-&gt;repeatEnd = *localtime(&amp;local-&gt;ical-&gt;recur-&gt;_enddate);</div><div class='del'>-		}</div><div class='del'>-		local-&gt;a-&gt;repeatFrequency = local-&gt;ical-&gt;recur-&gt;interval; </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		for ( daycount=0; daycount&lt;7; daycount++ ) {</div><div class='del'>-			if (local-&gt;ical-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; daycount))</div><div class='del'>-				local-&gt;a-&gt;repeatDays[daycount] = 1;</div><div class='del'>- 		}</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;a-&gt;repeatType = repeatNone;</div><div class='del'>-		local-&gt;a-&gt;repeatForever = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatEnd = local-&gt;a-&gt;end;</div><div class='del'>-		local-&gt;a-&gt;repeatFrequency = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDay = dom1stSun;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[0] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[1] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[2] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[3] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[4] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[5] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatDays[6] = 0;</div><div class='del'>-		local-&gt;a-&gt;repeatWeekstart = 0;</div><div class='del'>-		local-&gt;a-&gt;exceptions = 0;</div><div class='del'>-		local-&gt;a-&gt;exception = NULL;</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 deallocte */</div><div class='del'>-	local-&gt;a-&gt;note = </div><div class='del'>-		local-&gt;ical-&gt;comment==NULL?NULL:strdup(local-&gt;ical-&gt;comment);</div><div class='del'>-	local-&gt;a-&gt;description = </div><div class='del'>-		local-&gt;ical-&gt;summary==NULL?NULL:strdup(local-&gt;ical-&gt;summary);</div><div class='del'>-</div><div class='del'>-	/* Generate pilot record structure */</div><div class='del'>-	p-&gt;record = g_new0(char,0xffff);</div><div class='del'>-	p-&gt;length = pack_Appointment(local-&gt;a,p-&gt;record,0xffff);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* This is some debug code that hexdumps the calendar entry...</div><div class='del'>-	   You won't need this. */</div><div class='del'>-	{</div><div class='del'>-		int x,y;</div><div class='del'>-		g_message("calconduit: new item from %s to %s",asctime(&amp;(local-&gt;a-&gt;begin)),asctime(&amp;(local-&gt;a-&gt;end))); </div><div class='del'>-		</div><div class='del'>-		g_message("local-&gt;a-&gt;note = %s",local-&gt;a-&gt;note);</div><div class='del'>-		g_message("local-&gt;a-&gt;description = %s",local-&gt;a-&gt;description);</div><div class='del'>-		g_message("sizeof(p-&gt;record) = %d, length is %d",sizeof(p-&gt;record),p-&gt;length);</div><div class='del'>-		for(x=0;x&lt;p-&gt;length;x+=32) {</div><div class='del'>-			for(y=x;y&lt;x+32;y++)</div><div class='del'>-				if(p-&gt;record[y]&lt;33 || p-&gt;record[y]&gt;128)</div><div class='del'>-					printf("%02X",p-&gt;record[y]);</div><div class='del'>-				else </div><div class='del'>-					printf(" %c",p-&gt;record[y]);</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'>-	*remote = p;</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_transmit (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	       GCalLocalRecord *local,</div><div class='del'>-	       PilotRecord **remote,</div><div class='del'>-	       GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering free_transmit");</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'>-	free_Appointment(local-&gt;a);</div><div class='del'>-	g_free((*remote)-&gt;record);</div><div class='del'>-	*remote = NULL;</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 (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	    GCalLocalRecord *local,</div><div class='del'>-	    PilotRecord *remote,</div><div class='del'>-	    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	PilotRecord *remoteOfLocal;</div><div class='del'>-	int err;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	/* used by the tedious compare */</div><div class='del'>-	struct Appointment a; </div><div class='del'>-	int daycount;</div><div class='del'>-</div><div class='del'>-	g_message ("entering compare");</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'>-#if 1</div><div class='del'>-	err = transmit(conduit,local,&amp;remoteOfLocal,ctxt);</div><div class='del'>-	if (err != 0) return err;</div><div class='del'>-</div><div class='del'>-	retval = 0;</div><div class='del'>-	if (remote-&gt;length == remoteOfLocal-&gt;length) {</div><div class='del'>-		if (memcmp(remoteOfLocal-&gt;record,remote-&gt;record,remote-&gt;length)!=0) {</div><div class='del'>-			g_message("compare failed on contents");</div><div class='del'>-			retval = 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_message("compare failed on length");</div><div class='del'>-		retval = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_transmit(conduit,local,&amp;remoteOfLocal,ctxt);	</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-	/** FIXME: All the { LOG("yadayada"); return 1; } bloat is for debug purposes.</div><div class='del'>-	    Once this is known to work, compact to return 1;'s */</div><div class='del'>-</div><div class='del'>-	/* Check record attributes */</div><div class='del'>-	if (local-&gt;local.ID != remote-&gt;ID) {</div><div class='del'>-		LOG("failed local-&gt;local.ID == remote-&gt;ID");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;local.attr != remote-&gt;attr) {</div><div class='del'>-		LOG("failed local-&gt;local.attr == remote-&gt;attr");</div><div class='del'>-		return 1; </div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;local.archived != remote-&gt;archived) {</div><div class='del'>-		LOG("failed local-&gt;local.archived == remote-&gt;archived");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (local-&gt;local.secret != remote-&gt;secret) {</div><div class='del'>-		LOG("failed local-&gt;local.secret == remote-&gt;secret");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unpack_Appointment(&amp;a,remote-&gt;record,remote-&gt;length);</div><div class='del'>-	</div><div class='del'>-	/* Check records begin/end time */</div><div class='del'>-	if (a.event==0) {</div><div class='del'>-/* FIXME</div><div class='del'>-		if (a.begin != *localtime(&amp;local-&gt;ical-&gt;dtstart)) {</div><div class='del'>-			LOG("a.begin == *localtime(&amp;local-&gt;ical-&gt;dtstart)");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if (a.end != *localtime(&amp;local-&gt;ical-&gt;dtend)) {</div><div class='del'>-			LOG("a.end == *localtime(&amp;local-&gt;ical-&gt;dtend)");</div><div class='del'>-			return 1;</div><div class='del'>-		}			</div><div class='del'>-*/</div><div class='del'>-	} else {</div><div class='del'>-		LOG("failed local-&gt;a.event != 0, unsupported by gnomecal");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check records alarm settings */</div><div class='del'>-	if(a.alarm == 1) {</div><div class='del'>-		if (local-&gt;ical-&gt;aalarm.enabled == 1) {</div><div class='del'>-			if (a.advance != local-&gt;ical-&gt;aalarm.count) {</div><div class='del'>-				LOG("failed a.advance == local-&gt;ical-&gt;aalarm.count");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-			switch(local-&gt;ical-&gt;aalarm.units) {</div><div class='del'>-			case ALARM_MINUTES:</div><div class='del'>-				if (a.advanceUnits != advMinutes) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;aalarm.units == a.advanceUnits");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case ALARM_HOURS:</div><div class='del'>-				if (a.advanceUnits != advHours) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;aalarm.units == a.advanceUnits");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case ALARM_DAYS:</div><div class='del'>-				if (a.advanceUnits != advDays) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;aalarm.units == a.advanceUnits");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			LOG("failed a.alarm == 1 &amp;&amp; local-&gt;ical-&gt;aalarm.enabled == 1");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} else if  (local-&gt;ical-&gt;aalarm.enabled == 1) {</div><div class='del'>-		LOG("failed a.alarm != 1 &amp;&amp; local-&gt;ical-&gt;aalarm.enabled != 1");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check records recurrence settings */</div><div class='del'>-        /* If this code is broken, a more or less safe although not efficient</div><div class='del'>-	   approach is (other the fixing the bug), if either has recurrence, </div><div class='del'>-	   return 1, thus failing the comparision */</div><div class='del'>-	if (local-&gt;ical-&gt;recur != NULL) {</div><div class='del'>-		if (a.repeatType == repeatNone) {</div><div class='del'>-			LOG("failed: local-&gt;ical-&gt;recur != NULL &amp;&amp; a.repeatType != repeatNone");</div><div class='del'>-			return 1;</div><div class='del'>-		} </div><div class='del'>-		switch (local-&gt;ical-&gt;recur-&gt;type) {</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			if (a.repeatType != repeatDaily) {</div><div class='del'>-				LOG("failed a.repeatType == repeatDaily");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			if (a.repeatType != repeatWeekly) {</div><div class='del'>-				LOG("failed a.repeatType == repeatWeekly");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_POS:</div><div class='del'>-			if (a.repeatType != repeatMonthlyByDate) {</div><div class='del'>-				LOG("failed a.repeatType == repeatMonthlyByDate");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			if (a.repeatType != repeatMonthlyByDay) {</div><div class='del'>-				LOG("failed a.repeatType == repeatMonthlyByDay");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-			if (a.repeatType != repeatYearly) {</div><div class='del'>-				LOG("failed a.repeatType == repeatYearly");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-			if (a.repeatType != repeatYearly) {</div><div class='del'>-				LOG("failed a.repeatType == repeatYearly");</div><div class='del'>-				return 1; }</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (local-&gt;ical-&gt;recur-&gt;duration == 0) {</div><div class='del'>-			if(a.repeatForever != 1) {</div><div class='del'>-				LOG("failed local-&gt;ical-&gt;recur-&gt;duration == 0 &amp;&amp; a.repeatForever == 1");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if(a.repeatForever != 0) {</div><div class='del'>-				LOG("failed local-&gt;ical-&gt;recur-&gt;duration != 0 &amp;&amp; ! a.repeatForever == 0");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-/* FIXME</div><div class='del'>-			if(a.repeatEnd != *localtime(&amp;local-&gt;ical-&gt;recur-&gt;_enddate)) {</div><div class='del'>-				LOG("failed a.repeatEnd == *localtime(&amp;local-&gt;ical-&gt;recur-&gt;_enddate)");</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-*/</div><div class='del'>-		}</div><div class='del'>-		if (a.repeatFrequency != local-&gt;ical-&gt;recur-&gt;interval) {</div><div class='del'>-			LOG("failed a.repeatFrequency == local-&gt;ical-&gt;recur-&gt;interval");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		for (daycount = 0; daycount&lt;7; daycount++) {</div><div class='del'>-			if(local-&gt;ical-&gt;recur-&gt;weekday &amp; (1&lt;&lt;daycount)) {</div><div class='del'>-				if (a.repeatDays[daycount]!=1) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;recur-&gt;weekday &amp; (1&lt;&lt;daycount) &amp;&amp; a.repeatDays[daycount]==1");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (a.repeatDays[daycount]!=0) {</div><div class='del'>-					LOG("failed local-&gt;ical-&gt;recur-&gt;weekday &amp;! (1&lt;&lt;daycount) &amp;&amp; a.repeatDays[daycount]==0");</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (a.repeatType != repeatNone ) {</div><div class='del'>-		LOG("failed: local-&gt;ical-&gt;recur == NULL &amp;&amp; a.repeatType == repeatNone");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check the note and description */</div><div class='del'>-	if(a.note!=NULL) {</div><div class='del'>-		if(local-&gt;ical-&gt;comment==NULL) {</div><div class='del'>-			LOG("failed a.note != NULL &amp;&amp; local-&gt;ical-&gt;coment != NULL");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if(strcmp(local-&gt;ical-&gt;comment,a.note)!=0) {</div><div class='del'>-			LOG("failed strcmp(local-&gt;ical-&gt;comment,a.note)==0");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} if(local-&gt;ical-&gt;comment!=NULL) {</div><div class='del'>-		LOG("failed a.note == NULL &amp;&amp; local-&gt;ical-&gt;coment == NULL");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if(a.description!=NULL) {</div><div class='del'>-		if(local-&gt;ical-&gt;summary==NULL) {</div><div class='del'>-			LOG("failed a.description != NULL &amp;&amp; local-&gt;ical-&gt;coment != NULL");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		if(strcmp(local-&gt;ical-&gt;summary,a.description)!=0) {</div><div class='del'>-			LOG("failed strcmp(local-&gt;ical-&gt;summary,a.description)==0");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} if(local-&gt;ical-&gt;summary!=NULL) {</div><div class='del'>-		LOG("failed a.description == NULL &amp;&amp; local-&gt;ical-&gt;coment == NULL");</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'>-static gint</div><div class='del'>-compare_backup (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-		GCalLocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("entering compare_backup");</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'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_all (GnomePilotConduitStandardAbs *conduit,</div><div class='del'>-	    GCalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GSList *events,*it;</div><div class='del'>-	gboolean error;</div><div class='del'>-</div><div class='del'>-	events = get_calendar_objects(conduit,&amp;error,ctxt);</div><div class='del'>-	</div><div class='del'>-	if (error == FALSE) return -1;</div><div class='del'>-	for (it=events;it;it = g_slist_next(it)) {</div><div class='del'>-		GNOME_Calendar_Repository_delete_object(ctxt-&gt;calendar,</div><div class='del'>-							it-&gt;data,</div><div class='del'>-							&amp;(ctxt-&gt;ev));</div><div class='del'>-		if (ctxt-&gt;ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-			INFO ("Object did not exist");</div><div class='del'>-			show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-			CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-		} else if(ctxt-&gt;ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			WARN (_("Error while communicating with calendar server"));</div><div class='del'>-			show_exception(&amp;(ctxt-&gt;ev));</div><div class='del'>-			CORBA_exception_free(&amp;(ctxt-&gt;ev)); </div><div class='del'>-			/* destroy loop, free data */</div><div class='del'>-			for (it=events;it;it = g_slist_next(it)) g_free(it-&gt;data);</div><div class='del'>-			g_slist_free(events);</div><div class='del'>-			return -1;</div><div class='del'>-		} </div><div class='del'>-		g_free(it-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	g_slist_free(events);</div><div class='del'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilotId)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	GCalConduitCfg *cfg;</div><div class='del'>-	GCalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_standard_abs_new ("DatebookDB", 0x64617465);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-	gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"GnomeCalConduit");</div><div class='del'>-</div><div class='del'>-	gcalconduit_load_configuration(&amp;cfg,pilotId);</div><div class='del'>-	gtk_object_set_data(retval,"gcalconduit_cfg",cfg);</div><div class='del'>-</div><div class='del'>-	gcalconduit_new_context(&amp;ctxt,cfg);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(retval),"gcalconduit_context",ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, 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'>-        GCalConduitCfg *cc;</div><div class='del'>-	GCalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-        cc = GET_GCALCONFIG(conduit);</div><div class='del'>-	ctxt = GET_GCALCONTEXT(conduit);</div><div class='del'>-</div><div class='del'>-	if(ctxt-&gt;calendar!=CORBA_OBJECT_NIL)</div><div class='del'>-		GNOME_Calendar_Repository_done (ctxt-&gt;calendar, &amp;(ctxt-&gt;ev));</div><div class='del'>-</div><div class='del'>-        gcalconduit_destroy_configuration(&amp;cc);</div><div class='del'>-</div><div class='del'>-	gcalconduit_destroy_context(&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/calendar-conduit.h b/calendar/gui/calendar-conduit.h<br/>deleted file mode 100644<br/>index fa8c151d4c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-conduit.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-conduit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#ifndef __CALENDAR_CONDUIT_H__</div><div class='del'>-#define __CALENDAR_CONDUIT_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;unistd.h&gt;</div><div class='del'>-#include &lt;gnome.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-standard-abs.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "GnomeCal.h"</div><div class='del'>-</div><div class='del'>-/* This is the local record structure for the GnomeCal conduit. */</div><div class='del'>-typedef struct _GCalLocalRecord GCalLocalRecord;</div><div class='del'>-struct _GCalLocalRecord {</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'>-	LocalRecord local;</div><div class='del'>-	/* The corresponding iCal object, as found by GnomeCal. */</div><div class='del'>-	iCalObject *ical;</div><div class='del'>-        /* pilot-link appointment structure, used for implementing Transmit. */	</div><div class='del'>-	struct Appointment *a;</div><div class='del'>-};</div><div class='del'>-#define GCAL_LOCALRECORD(s) ((GCalLocalRecord*)(s))</div><div class='del'>-</div><div class='del'>-/* This is the configuration of the GnomeCal conduit. */</div><div class='del'>-typedef struct _GCalConduitCfg GCalConduitCfg;</div><div class='del'>-struct _GCalConduitCfg {</div><div class='del'>-	gboolean open_secret;</div><div class='del'>-	guint32 pilotId;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */</div><div class='del'>-};</div><div class='del'>-#define GET_GCALCONFIG(c) ((GCalConduitCfg*)gtk_object_get_data(GTK_OBJECT(c),"gcalconduit_cfg"))</div><div class='del'>-</div><div class='del'>-/* This is the context for all the GnomeCal conduit methods. */</div><div class='del'>-typedef struct _GCalConduitContext GCalConduitContext;</div><div class='del'>-struct _GCalConduitContext {</div><div class='del'>-	struct AppointmentAppInfo ai;</div><div class='del'>-	GCalConduitCfg *cfg;</div><div class='del'>-	GNOME_Calendar_Repository calendar;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-};</div><div class='del'>-#define GET_GCALCONTEXT(c) ((GCalConduitContext*)gtk_object_get_data(GTK_OBJECT(c),"gcalconduit_context"))</div><div class='del'>-</div><div class='del'>-/* Given a GCalConduitCfg*, allocates the structure and </div><div class='del'>-   loads the configuration data for the given pilot. */</div><div class='del'>-static void </div><div class='del'>-gcalconduit_load_configuration(GCalConduitCfg **c,</div><div class='del'>-			       guint32 pilotId) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-	g_snprintf(prefix,255,"/gnome-pilot.d/calendard-conduit/Pilot_%u/",pilotId);</div><div class='del'>-	</div><div class='del'>-	*c = g_new0(GCalConduitCfg,1);</div><div class='del'>-	g_assert(*c != NULL);</div><div class='del'>-	gnome_config_push_prefix(prefix);</div><div class='del'>-	(*c)-&gt;open_secret = gnome_config_get_bool("open_secret=FALSE");</div><div class='del'>-	(*c)-&gt;sync_type = GnomePilotConduitSyncTypeCustom; /* set in capplets main */</div><div class='del'>-	gnome_config_pop_prefix();</div><div class='del'>-	</div><div class='del'>-	(*c)-&gt;pilotId = pilotId;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves the configuration data. */</div><div class='del'>-static void </div><div class='del'>-gcalconduit_save_configuration(GCalConduitCfg *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/calendar-conduit/Pilot_%u/",c-&gt;pilotId);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix(prefix);</div><div class='del'>-	gnome_config_set_bool("open_secret",c-&gt;open_secret);</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'>-/* Creates a duplicate of the configuration data */</div><div class='del'>-static GCalConduitCfg*</div><div class='del'>-gcalconduit_dupe_configuration(GCalConduitCfg *c) {</div><div class='del'>-	GCalConduitCfg *retval;</div><div class='del'>-	g_return_val_if_fail(c!=NULL,NULL);</div><div class='del'>-	retval = g_new0(GCalConduitCfg,1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;open_secret = c-&gt;open_secret;</div><div class='del'>-	retval-&gt;pilotId = c-&gt;pilotId;</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroys any data allocated by gcalconduit_load_configuration</div><div class='del'>-   and deallocates the given configuration. */</div><div class='del'>-static void </div><div class='del'>-gcalconduit_destroy_configuration(GCalConduitCfg **c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(c!=NULL);</div><div class='del'>-	g_return_if_fail(*c!=NULL);</div><div class='del'>-	g_free(*c);</div><div class='del'>-	*c = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Given a GCalConduitContxt*, allocates the structure */</div><div class='del'>-static void</div><div class='del'>-gcalconduit_new_context(GCalConduitContext **ctxt,</div><div class='del'>-			GCalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	*ctxt = g_new0(GCalConduitContext,1);</div><div class='del'>-	g_assert(ctxt!=NULL);</div><div class='del'>-	(*ctxt)-&gt;cfg = c;</div><div class='del'>-	CORBA_exception_init (&amp;((*ctxt)-&gt;ev));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroys any data allocated by gcalconduit_new_context</div><div class='del'>-   and deallocates its data. */</div><div class='del'>-static void</div><div class='del'>-gcalconduit_destroy_context(GCalConduitContext **ctxt)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(ctxt!=NULL);</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'>-		gcalconduit_destroy_configuration(&amp;((*ctxt)-&gt;cfg));</div><div class='del'>-*/</div><div class='del'>-	g_free(*ctxt);</div><div class='del'>-	*ctxt = NULL;</div><div class='del'>-}</div><div class='del'>-#endif __CALENDAR_CONDUIT_H__ </div><div class='head'>diff --git a/calendar/gui/calendar-control.gnorba b/calendar/gui/calendar-control.gnorba<br/>deleted file mode 100644<br/>index ed504d8f5b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-control.gnorba?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-control.gnorba</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-[control-factory:calendar]</div><div class='del'>-type=exe</div><div class='del'>-repo_id=IDL:Bonobo/GenericFactory:1.0</div><div class='del'>-description=Factory for the sample Calendar control</div><div class='del'>-location_info=evolution-calendar</div><div class='del'>-</div><div class='del'>-[control:calendar]</div><div class='del'>-type=factory</div><div class='del'>-repo_id=IDL:BonoboControl/calendar-control:1.0 IDL:Bonobo/Control:1.0</div><div class='del'>-description=A sample Bonobo control which displays an calendar.</div><div class='del'>-location_info=control-factory:calendar</div><div class='head'>diff --git a/calendar/gui/calendar-control.oafinfo b/calendar/gui/calendar-control.oafinfo<br/>deleted file mode 100644<br/>index fb0f138caf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-control.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-control.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"</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:Bonobo/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 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:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"&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;/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_info&gt;</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 49fefbcdd4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-model.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,780 +0,0 @@</div><div class='del'>-/* Evolution calendar - Data model for ETable</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the ECalendarModel structure */</div><div class='del'>-typedef struct {</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'>-	/* Array of pointers to calendar objects */</div><div class='del'>-	GArray *objects;</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'>-} CalendarModelPrivate;</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_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'>-</div><div class='del'>-static void calendar_model_freeze (ETableModel *etm);</div><div class='del'>-static void calendar_model_thaw (ETableModel *etm);</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;duplicate_value = calendar_model_duplicate_value;</div><div class='del'>-#if 0</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'>-#endif</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;objects = g_array_new (FALSE, TRUE, sizeof (iCalObject *));</div><div class='del'>-	priv-&gt;uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);</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'>-		iCalObject *ico;</div><div class='del'>-</div><div class='del'>-		ico = g_array_index (priv-&gt;objects, iCalObject *, i);</div><div class='del'>-		g_assert (ico != NULL);</div><div class='del'>-		ical_object_unref (ico);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (priv-&gt;objects, 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'>-	/* 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'>-	/* 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'>-	/* 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 ICAL_OBJECT_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'>-/* 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'>-	iCalObject *ico;</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; ICAL_OBJECT_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'>-	ico = g_array_index (priv-&gt;objects, iCalObject *, row);</div><div class='del'>-	g_assert (ico != NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case ICAL_OBJECT_FIELD_COMMENT:</div><div class='del'>-		return ico-&gt;comment ? ico-&gt;comment : "";</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_COMPLETED:</div><div class='del'>-		return &amp;ico-&gt;completed;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_CREATED:</div><div class='del'>-		return &amp;ico-&gt;created;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DESCRIPTION:</div><div class='del'>-		return ico-&gt;desc ? ico-&gt;desc : "";</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTSTAMP:</div><div class='del'>-		return &amp;ico-&gt;dtstamp;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTSTART:</div><div class='del'>-		return &amp;ico-&gt;dtstart;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTEND:</div><div class='del'>-		return &amp;ico-&gt;dtend;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_GEO:</div><div class='del'>-		return &amp;ico-&gt;geo;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_LAST_MOD:</div><div class='del'>-		return &amp;ico-&gt;last_mod;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_LOCATION:</div><div class='del'>-		return ico-&gt;location ? ico-&gt;location : "";</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_ORGANIZER:</div><div class='del'>-		return ico-&gt;organizer;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_PERCENT:</div><div class='del'>-		return &amp;ico-&gt;percent;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_PRIORITY:</div><div class='del'>-		return &amp;ico-&gt;priority;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_SUMMARY:</div><div class='del'>-		return ico-&gt;summary ? ico-&gt;summary : "";</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_URL:</div><div class='del'>-		return ico-&gt;url ? ico-&gt;url : "";</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_HAS_ALARMS:</div><div class='del'>-		return (gpointer) (ico-&gt;dalarm.enabled || ico-&gt;aalarm.enabled</div><div class='del'>-				   || ico-&gt;palarm.enabled || ico-&gt;malarm.enabled);</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'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replaces a string */</div><div class='del'>-static void</div><div class='del'>-set_string (char **dest, char *value)</div><div class='del'>-{</div><div class='del'>-	if (*dest)</div><div class='del'>-		g_free (*dest);</div><div class='del'>-</div><div class='del'>-	if (value)</div><div class='del'>-		*dest = g_strdup (value);</div><div class='del'>-	else</div><div class='del'>-		*dest = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replaces a time_t value */</div><div class='del'>-static void</div><div class='del'>-set_time_t (time_t *dest, time_t *value)</div><div class='del'>-{</div><div class='del'>-	*dest = *value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replaces a geo value */</div><div class='del'>-static void</div><div class='del'>-set_geo (iCalGeo *dest, iCalGeo *value)</div><div class='del'>-{</div><div class='del'>-	*dest = *value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Replaces a person value */</div><div class='del'>-static void</div><div class='del'>-set_person (iCalPerson *dest, iCalPerson *value)</div><div class='del'>-{</div><div class='del'>-	/* FIXME */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets an int value */</div><div class='del'>-static void</div><div class='del'>-set_int (int *dest, int *value)</div><div class='del'>-{</div><div class='del'>-	*dest = *value;</div><div class='del'>-}</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'>-	iCalObject *ico;</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; ICAL_OBJECT_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'>-	ico = g_array_index (priv-&gt;objects, iCalObject *, row);</div><div class='del'>-	g_assert (ico != NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case ICAL_OBJECT_FIELD_COMMENT:</div><div class='del'>-		set_string (&amp;ico-&gt;comment);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_COMPLETED:</div><div class='del'>-		set_time_t (&amp;ico-&gt;completed, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_CREATED:</div><div class='del'>-		set_time_t (&amp;ico-&gt;created, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DESCRIPTION:</div><div class='del'>-		set_string (&amp;ico-&gt;desc, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTSTAMP:</div><div class='del'>-		set_time_t (&amp;ico-&gt;dtstamp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTSTART:</div><div class='del'>-		set_time_t (&amp;ico-&gt;dtstart, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTEND:</div><div class='del'>-		set_time_t (&amp;ico-&gt;dtend, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_GEO:</div><div class='del'>-		set_geo (&amp;ico-&gt;geo, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_LAST_MOD:</div><div class='del'>-		set_time (&amp;ico-&gt;last_mod, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_LOCATION:</div><div class='del'>-		set_string (&amp;ico-&gt;location, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_ORGANIZER:</div><div class='del'>-		set_person (&amp;ico-&gt;organizer, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_PERCENT:</div><div class='del'>-		set_int (&amp;ico-&gt;percent, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_PRIORITY:</div><div class='del'>-		set_int (&amp;ico-&gt;priority, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_SUMMARY:</div><div class='del'>-		set_string (&amp;ico-&gt;summary, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_URL:</div><div class='del'>-		set_string (&amp;ico-&gt;url, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_HAS_ALARMS:</div><div class='del'>-		g_message ("calendar_model_set_value_at(): HAS_ALARMS is not a settable field!");</div><div class='del'>-		break;</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'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, ico))</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; ICAL_OBJECT_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'>-	switch (col) {</div><div class='del'>-	case ICAL_OBJECT_FIELD_HAS_ALARMS:</div><div class='del'>-		return FALSE;</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'>-</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'>-	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; ICAL_OBJECT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case ICAL_OBJECT_FIELD_COMMENT:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_COMPLETED:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_CREATED:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DESCRIPTION:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTSTAMP:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTSTART:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_DTEND:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_GEO:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_LAST_MOD:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_LOCATION:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_ORGANIZER:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_PERCENT:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_PRIORITY:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_SUMMARY:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_URL:</div><div class='del'>-</div><div class='del'>-	case ICAL_OBJECT_FIELD_HAS_ALARMS:</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-	}</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'>-/* 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'>-	iCalObject *orig_ico;</div><div class='del'>-	int i;</div><div class='del'>-	int n;</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_ico = g_array_index (priv-&gt;objects, iCalObject *, *idx);</div><div class='del'>-	g_assert (orig_ico != 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'>-		iCalObject *ico;</div><div class='del'>-		int *ico_idx;</div><div class='del'>-</div><div class='del'>-		ico = g_array_index (priv-&gt;objects, iCalObject *, i);</div><div class='del'>-		g_assert (ico != NULL);</div><div class='del'>-</div><div class='del'>-		ico_idx = g_hash_table_lookup (priv-&gt;uid_index_hash, ico-&gt;uid);</div><div class='del'>-		g_assert (ico_idx != NULL);</div><div class='del'>-</div><div class='del'>-		(*ico_idx)--;</div><div class='del'>-		g_assert (*ico_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'>-	ical_object_unref (orig_ico);</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'>-/* Callback used when an object is updated in the server */</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'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	int orig_idx;</div><div class='del'>-	iCalObject *new_ico;</div><div class='del'>-	int *new_idx;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	gboolean added;</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'>-	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_ico);</div><div class='del'>-</div><div class='del'>-	added = FALSE;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</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_ico);</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'>-			g_hash_table_insert (priv-&gt;uid_index_hash, new_ico-&gt;uid, 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_ico);</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, new_ico-&gt;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'>-				iCalObject *ico;</div><div class='del'>-				int *ico_idx;</div><div class='del'>-</div><div class='del'>-				ico = g_array_index (priv-&gt;objects, iCalObject *, i);</div><div class='del'>-				g_assert (ico != NULL);</div><div class='del'>-</div><div class='del'>-				ico_idx = g_hash_table_lookup (priv-&gt;uid_index_hash, ico-&gt;uid);</div><div class='del'>-				g_assert (ico_idx != NULL);</div><div class='del'>-</div><div class='del'>-				(*ico_idx)++;</div><div class='del'>-			}</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'>-		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'>-</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'>-</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 an object is removed in the server */</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'>-	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'>-	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'>-}</div><div class='del'>-</div><div class='del'>-/* Loads the required objects from the calendar client */</div><div class='del'>-static void</div><div class='del'>-load_objects (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_uids (priv-&gt;client, priv-&gt;type);</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'>-		iCalObject *ico;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		int *idx;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-		status = cal_client_get_object (priv-&gt;client, uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</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 */</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-			g_message ("load_objects(): Syntax error when getting object `%s'", uid);</div><div class='del'>-			continue;</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 (ico-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-		idx = g_new (int, 1);</div><div class='del'>-</div><div class='del'>-		g_array_append_val (priv-&gt;objects, ico);</div><div class='del'>-		*idx = priv-&gt;objects-&gt;len - 1;</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (priv-&gt;uid_index_hash, ico-&gt;uid, idx);</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'>-</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'>-	free_objects (model);</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'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_updated",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_updated_cb), model);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_removed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_removed_cb), model);</div><div class='del'>-</div><div class='del'>-		load_objects (model);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (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 7e28436e59..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-model.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* Evolution calendar - Data model for ETable</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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;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'>-struct _CalendarModel {</div><div class='del'>-	ETableModel model;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer 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'>-void calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType 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-pilot-sync.c b/calendar/gui/calendar-pilot-sync.c<br/>deleted file mode 100644<br/>index 98740a51f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-pilot-sync.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/calendar-pilot-sync.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,658 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * calendar-pilot-sync.c:</div><div class='del'>- *   </div><div class='del'>- * (C) 1999 International GNOME Support</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Miguel de Icaza (miguel@gnome-support.com)</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;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;libgnorba/gnome-factory.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include "calobj.h"</div><div class='del'>-/* #include "calendar.h" DELETE */</div><div class='del'>-#include "timeutil.h"</div><div class='del'>-#include "GnomeCal.h"</div><div class='del'>-#include "pi-source.h"</div><div class='del'>-#include "pi-socket.h"</div><div class='del'>-#include "pi-datebook.h"</div><div class='del'>-#include "pi-dlp.h"</div><div class='del'>-</div><div class='del'>-/* the CORBA ORB */</div><div class='del'>-CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-/* The default port to communicate with */</div><div class='del'>-char *pilot_port = "/dev/pilot";</div><div class='del'>-</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-/* Our pi-socket address where we connect to */</div><div class='del'>-struct pi_sockaddr addr;</div><div class='del'>-</div><div class='del'>-/* The Pilot DB identifier for DateBook */</div><div class='del'>-int db;</div><div class='del'>-</div><div class='del'>-/* If true, enable debug output for alarms */</div><div class='del'>-int debug_alarms = 0;</div><div class='del'>-</div><div class='del'>-/* True if you want to dump the flags bits from the records */</div><div class='del'>-int debug_attrs = 0;</div><div class='del'>-</div><div class='del'>-/* Default values for alarms */</div><div class='del'>-CalendarAlarm alarm_defaults[4] = {</div><div class='del'>-	{ ALARM_MAIL, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_PROGRAM, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_DISPLAY, 0, 15, ALARM_MINUTES },</div><div class='del'>-	{ ALARM_AUDIO, 0, 15, ALARM_MINUTES }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int only_desktop_to_pilot = 0;</div><div class='del'>-</div><div class='del'>-int only_pilot_to_desktop = 0;</div><div class='del'>-</div><div class='del'>-const struct poptOption calendar_sync_options [] = {</div><div class='del'>-	{ "pilot", 0, POPT_ARG_STRING, &amp;pilot_port, 0,</div><div class='del'>-	  N_("Specifies the port on which the Pilot is"), N_("PORT") },</div><div class='del'>-	{ "debug-attrs", 0, POPT_ARG_NONE, &amp;debug_attrs, 0,</div><div class='del'>-	  N_("If you want to debug the attributes on records"), NULL },</div><div class='del'>-	{ "only-desktop", 0, POPT_ARG_NONE, &amp;only_desktop_to_pilot, 0,</div><div class='del'>-	  N_("Only syncs from desktop to pilot"), NULL },</div><div class='del'>-	{ "only-pilot", 0, POPT_ARG_INT, &amp;only_pilot_to_desktop, 0,</div><div class='del'>-	  N_("Only syncs from pilot to desktop"), NULL },</div><div class='del'>-	{ NULL, '\0', 0, NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-conduit_free_Appointment (struct Appointment *a)</div><div class='del'>-{</div><div class='del'>-	/* free_Appointment is brain-dead with respect to guarding against</div><div class='del'>-	   double-frees */</div><div class='del'>-	</div><div class='del'>-	free_Appointment (a);</div><div class='del'>-	a-&gt;exception = 0;</div><div class='del'>-	a-&gt;description = 0;</div><div class='del'>-	a-&gt;note = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-setup_connection (void)</div><div class='del'>-{</div><div class='del'>-	int socket;</div><div class='del'>-	int ret, news;</div><div class='del'>-	</div><div class='del'>-	if (!(socket = pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP))) </div><div class='del'>-		g_error (_("Can not create Pilot socket\n"));</div><div class='del'>-</div><div class='del'>-	addr.pi_family = PI_AF_SLP;</div><div class='del'>-	strncpy ((void *) &amp;addr.pi_device, pilot_port, sizeof (addr.pi_device));</div><div class='del'>-</div><div class='del'>-	ret = pi_bind (socket, (struct sockaddr *)&amp;addr, sizeof (addr));</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		g_error (_("Can not bind to device %s\n"), pilot_port);</div><div class='del'>-</div><div class='del'>-	if (pi_listen (socket, 1) == -1)</div><div class='del'>-		g_error (_("Failed to get a connection from the Pilot device"));</div><div class='del'>-</div><div class='del'>-	if ((news = pi_accept (socket, 0, 0)) == -1)</div><div class='del'>-		g_error (_("pi_accept failed"));</div><div class='del'>-</div><div class='del'>-	return news;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Calendar_Repository</div><div class='del'>-locate_calendar_server (void)</div><div class='del'>-{</div><div class='del'>-	GNOME_Calendar_Repository repo;</div><div class='del'>-	</div><div class='del'>-	repo = goad_server_activate_with_id (</div><div class='del'>-		NULL, "IDL:GNOME:Calendar:Repository:1.0",</div><div class='del'>-		0, NULL);</div><div class='del'>-	</div><div class='del'>-	if (repo == CORBA_OBJECT_NIL)</div><div class='del'>-		g_error ("Can not communicate with GnomeCalendar server");</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION){</div><div class='del'>-		printf ("Exception: %s\n", CORBA_exception_id (&amp;ev));</div><div class='del'>-		abort ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return repo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_record (GNOME_Calendar_Repository repo, int id)</div><div class='del'>-{</div><div class='del'>-	char *uid;</div><div class='del'>-</div><div class='del'>-	uid = GNOME_Calendar_Repository_get_id_from_pilot_id (repo, id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	/* The record was already deleted */</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	GNOME_Calendar_Repository_delete_object (repo, uid, &amp;ev);</div><div class='del'>-	CORBA_free (uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_record (GNOME_Calendar_Repository repo, int id, struct Appointment *a, int attr)</div><div class='del'>-{</div><div class='del'>-	char *vcal_string;</div><div class='del'>-	iCalObject *obj;</div><div class='del'>-	int i;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	obj = ical_new (a-&gt;note ? a-&gt;note : "",</div><div class='del'>-			g_get_user_name (),</div><div class='del'>-			a-&gt;description ? a-&gt;description : "");</div><div class='del'>-</div><div class='del'>-	printf ("requesting %d [%s]\n", id, a-&gt;description);</div><div class='del'>-	vcal_string = GNOME_Calendar_Repository_get_object_by_pilot_id (repo, id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major == CORBA_USER_EXCEPTION){</div><div class='del'>-		time_t now = time (NULL);</div><div class='del'>-		</div><div class='del'>-		obj-&gt;created = now;</div><div class='del'>-		obj-&gt;last_mod = now;</div><div class='del'>-		obj-&gt;priority = 0;</div><div class='del'>-		obj-&gt;transp = 0;</div><div class='del'>-		obj-&gt;related = NULL;</div><div class='del'>-		obj-&gt;pilot_id = id;</div><div class='del'>-		obj-&gt;pilot_status = ICAL_PILOT_SYNC_NONE;</div><div class='del'>-		printf (_("\tObject did not exist, creating a new one\n"));</div><div class='del'>-	} else {</div><div class='del'>-		printf ("\tFound\n");</div><div class='del'>-		obj = ical_object_new_from_string (vcal_string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;pilot_status == ICAL_PILOT_SYNC_MOD){</div><div class='del'>-		printf (_("\tObject has been modified on desktop and on the pilot, desktop takes precedence\n"));</div><div class='del'>-		ical_object_unref (obj);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Begin and end</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (a-&gt;event)</div><div class='del'>-	{</div><div class='del'>-		/* turn day-long events into a full day's appointment */</div><div class='del'>-		a-&gt;begin.tm_sec = 0;</div><div class='del'>-		a-&gt;begin.tm_min = 0;</div><div class='del'>-		a-&gt;begin.tm_hour = 6;</div><div class='del'>-</div><div class='del'>-		a-&gt;end.tm_sec = 0;</div><div class='del'>-		a-&gt;end.tm_min = 0;</div><div class='del'>-		a-&gt;end.tm_hour = 10;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	obj-&gt;dtstart = mktime (&amp;a-&gt;begin);</div><div class='del'>-	obj-&gt;dtend = mktime (&amp;a-&gt;end);</div><div class='del'>-</div><div class='del'>-	/* Special case: daily repetitions are converted to a multi-day event */</div><div class='del'>-	if (a-&gt;repeatType == repeatDaily){</div><div class='del'>-		time_t newt = time_add_day (obj-&gt;dtend, a-&gt;repeatFrequency);</div><div class='del'>-</div><div class='del'>-		obj-&gt;dtend = newt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Alarm</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;alarm){</div><div class='del'>-		obj-&gt;aalarm.type = ALARM_AUDIO;</div><div class='del'>-		obj-&gt;aalarm.enabled = 1;</div><div class='del'>-		obj-&gt;aalarm.count = a-&gt;advance;</div><div class='del'>-</div><div class='del'>-		switch (a-&gt;advanceUnits){</div><div class='del'>-		case advMinutes:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_MINUTES;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case advHours:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_HOURS;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case advDays:</div><div class='del'>-			obj-&gt;aalarm.units = ALARM_DAYS;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Recurrence</div><div class='del'>-	 */</div><div class='del'>-	if (a-&gt;repeatFrequency &amp;&amp; a-&gt;repeatType != repeatDaily){</div><div class='del'>-		obj-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-		</div><div class='del'>-		switch (a-&gt;repeatType){</div><div class='del'>-		case repeatDaily:</div><div class='del'>-			/*</div><div class='del'>-			 * In the Pilot daily repetitions are actually</div><div class='del'>-			 * multi-day events</div><div class='del'>-			 */</div><div class='del'>-			g_warning ("Should not have got here");</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatMonthlyByDate:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_MONTHLY_BY_DAY;</div><div class='del'>-			obj-&gt;recur-&gt;u.month_day = a-&gt;repeatFrequency;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatWeekly:</div><div class='del'>-		{</div><div class='del'>-			int wd;</div><div class='del'>-</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_WEEKLY;</div><div class='del'>-			for (wd = 0; wd &lt; 7; wd++)</div><div class='del'>-				if (a-&gt;repeatDays [wd])</div><div class='del'>-					obj-&gt;recur-&gt;weekday |= 1 &lt;&lt; wd;</div><div class='del'>-</div><div class='del'>-			if (obj-&gt;recur-&gt;weekday == 0){</div><div class='del'>-				struct tm tm = *localtime (&amp;obj-&gt;dtstart);</div><div class='del'>-</div><div class='del'>-				obj-&gt;recur-&gt;weekday = 1 &lt;&lt; tm.tm_wday;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		case repeatMonthlyByDay:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_MONTHLY_BY_POS;</div><div class='del'>-			obj-&gt;recur-&gt;u.month_pos = a-&gt;repeatFrequency;</div><div class='del'>-			obj-&gt;recur-&gt;weekday = (a-&gt;repeatDay / 7);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case repeatYearly:</div><div class='del'>-			obj-&gt;recur-&gt;type = RECUR_YEARLY_BY_DAY;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_warning ("Unhandled repeate case");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (a-&gt;repeatForever)</div><div class='del'>-			obj-&gt;recur-&gt;duration = 0;</div><div class='del'>-		else</div><div class='del'>-			obj-&gt;recur-&gt;_enddate = mktime (&amp;a-&gt;repeatEnd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Load exception dates </div><div class='del'>-	 */</div><div class='del'>-	obj-&gt;exdate = NULL;</div><div class='del'>-	for (i = 0; i &lt; a-&gt;exceptions; i++){</div><div class='del'>-		time_t *t = g_new (time_t, 1);</div><div class='del'>-</div><div class='del'>-		*t = mktime (&amp;(a-&gt;exception [i]));</div><div class='del'>-		obj-&gt;exdate = g_list_prepend (obj-&gt;exdate, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (obj-&gt;class);</div><div class='del'>-	</div><div class='del'>-	if (attr &amp; dlpRecAttrSecret)</div><div class='del'>-		obj-&gt;class = g_strdup ("PRIVATE");</div><div class='del'>-	else</div><div class='del'>-		obj-&gt;class = g_strdup ("PUBLIC");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now, convert the in memory iCalObject to a full vCalendar we can send</div><div class='del'>-	 */</div><div class='del'>-	str = calendar_string_from_object (obj);</div><div class='del'>-</div><div class='del'>-	GNOME_Calendar_Repository_update_object (repo, obj-&gt;uid, str, &amp;ev);</div><div class='del'>-</div><div class='del'>-	free (str);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Shutdown</div><div class='del'>-	 */</div><div class='del'>-	ical_object_unref (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sets the alarm for Appointment based on @alarm</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-try_alarm (CalendarAlarm *alarm, struct Appointment *a)</div><div class='del'>-{</div><div class='del'>-	if (!alarm-&gt;enabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	a-&gt;advance = alarm-&gt;count;</div><div class='del'>-	switch (alarm-&gt;type){</div><div class='del'>-	case ALARM_DAYS:</div><div class='del'>-		a-&gt;advanceUnits = advDays;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ALARM_HOURS:</div><div class='del'>-		a-&gt;advanceUnits = advHours;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_MINUTES:</div><div class='del'>-		a-&gt;advanceUnits = advMinutes;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	a-&gt;alarm = 1;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_object_to_pilot (GNOME_Calendar_Repository repo, iCalObject *obj, int pilot_fd)</div><div class='del'>-{</div><div class='del'>-	char buffer [65536];</div><div class='del'>-	struct Appointment *a;</div><div class='del'>-	int wd, i, idx, attr, cat, rec_len;</div><div class='del'>-	recordid_t new_id;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	a = g_new0 (struct Appointment, 1);</div><div class='del'>-</div><div class='del'>-	attr = 0;</div><div class='del'>-	cat = 0;</div><div class='del'>-	idx = 0;</div><div class='del'>-	</div><div class='del'>-	if (obj-&gt;pilot_id){</div><div class='del'>-		rec_len = dlp_ReadRecordById (pilot_fd, db, obj-&gt;pilot_id,</div><div class='del'>-					      buffer, &amp;idx, &amp;rec_len, &amp;attr, &amp;cat);</div><div class='del'>-</div><div class='del'>-		if (rec_len &gt; 0)</div><div class='del'>-			unpack_Appointment (a, buffer, rec_len);</div><div class='del'>-	} else {</div><div class='del'>-		attr = 0;</div><div class='del'>-		cat = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* a contains the appointment either cleared or with the data from the Pilot */</div><div class='del'>-	a-&gt;begin = *localtime (&amp;obj-&gt;dtstart);</div><div class='del'>-	a-&gt;end   = *localtime (&amp;obj-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	/* FIXME: add support for timeless */</div><div class='del'>-	a-&gt;event = 0;</div><div class='del'>-</div><div class='del'>-	/* Alarms, try the various ones.  Probably we should only do Audio?</div><div class='del'>-	 * Otherwise going gnomecal-&gt;pilot-&gt;gnomecal would get the gnomecal</div><div class='del'>-	 * with *possibly* an alarm that was not originally defined.</div><div class='del'>-	 */</div><div class='del'>-	a-&gt;alarm = 0;</div><div class='del'>-	if (try_alarm (&amp;obj-&gt;aalarm, a) == 0)</div><div class='del'>-		if (try_alarm (&amp;obj-&gt;dalarm, a) == 0)</div><div class='del'>-			try_alarm (&amp;obj-&gt;palarm, a);</div><div class='del'>-</div><div class='del'>-	/* Recurrence */</div><div class='del'>-	if (obj-&gt;recur){</div><div class='del'>-		a-&gt;repeatFrequency = obj-&gt;recur-&gt;interval;</div><div class='del'>-		</div><div class='del'>-		switch (obj-&gt;recur-&gt;type){</div><div class='del'>-		case RECUR_MONTHLY_BY_POS:</div><div class='del'>-			a-&gt;repeatType = repeatMonthlyByDay;</div><div class='del'>-			a-&gt;repeatFrequency = obj-&gt;recur-&gt;u.month_pos;</div><div class='del'>-			a-&gt;repeatDay = obj-&gt;recur-&gt;weekday * 7;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			a-&gt;repeatType = repeatMonthlyByDate;</div><div class='del'>-			a-&gt;repeatFrequency = obj-&gt;recur-&gt;u.month_day;</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-			a-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			for (wd = 0; wd &lt; 7; wd++)</div><div class='del'>-				if (obj-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; wd))</div><div class='del'>-					a-&gt;repeatDays [wd] = 1;</div><div class='del'>-			a-&gt;repeatType = repeatWeekly;</div><div class='del'>-			break;</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			</div><div class='del'>-		default:</div><div class='del'>-			a-&gt;repeatType = repeatNone;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (obj-&gt;recur-&gt;enddate == 0){</div><div class='del'>-			a-&gt;repeatForever = 1;</div><div class='del'>-		} else</div><div class='del'>-			a-&gt;repeatEnd = *localtime (&amp;obj-&gt;recur-&gt;enddate);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Pilot uses a repeat-daily for a multi-day event, adjust for that case</div><div class='del'>-	 */</div><div class='del'>-	if ((a-&gt;end.tm_mday != a-&gt;begin.tm_mday) ||</div><div class='del'>-	    (a-&gt;end.tm_mon != a-&gt;begin.tm_mon) ||</div><div class='del'>-	    (a-&gt;end.tm_year != a-&gt;begin.tm_year)){</div><div class='del'>-		a-&gt;event = 1;</div><div class='del'>-		a-&gt;begin.tm_sec = 0;</div><div class='del'>-		a-&gt;begin.tm_min = 0;</div><div class='del'>-		a-&gt;begin.tm_hour = 0;</div><div class='del'>-</div><div class='del'>-		a-&gt;end.tm_sec = 0;</div><div class='del'>-		a-&gt;end.tm_min = 0;</div><div class='del'>-		a-&gt;end.tm_hour = 0;</div><div class='del'>-</div><div class='del'>-		a-&gt;repeatEnd = a-&gt;end;</div><div class='del'>-		a-&gt;repeatForever = 0;</div><div class='del'>-		a-&gt;repeatFrequency = 1;</div><div class='del'>-		a-&gt;repeatType = repeatDaily;</div><div class='del'>-	}</div><div class='del'>-	   </div><div class='del'>-	/*</div><div class='del'>-	 * Exceptions</div><div class='del'>-	 */</div><div class='del'>-	a-&gt;exceptions = g_list_length (obj-&gt;exdate);</div><div class='del'>-	a-&gt;exception = (struct tm *) malloc (sizeof (struct tm) * a-&gt;exceptions);</div><div class='del'>-	for (i = 0, l = obj-&gt;exdate; l; l = l-&gt;next, i++){</div><div class='del'>-		time_t *exdate = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		a-&gt;exception [i] = *localtime (exdate);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Description and note.</div><div class='del'>-	 *</div><div class='del'>-	 * We use strdup to be correct.  free_Appointment assumes we used</div><div class='del'>-	 * malloc.</div><div class='del'>-	 */</div><div class='del'>-	if (obj-&gt;comment)</div><div class='del'>-		a-&gt;note = strdup (obj-&gt;comment);</div><div class='del'>-	else</div><div class='del'>-		a-&gt;note = 0;</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;summary)</div><div class='del'>-		a-&gt;description = strdup (obj-&gt;summary);</div><div class='del'>-	else</div><div class='del'>-		a-&gt;description = strdup (_("No description"));</div><div class='del'>-</div><div class='del'>-	if (strcmp (obj-&gt;class, "PUBLIC") != 0)</div><div class='del'>-		attr |= dlpRecAttrSecret;</div><div class='del'>-	else</div><div class='del'>-		attr &amp;= ~dlpRecAttrSecret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send the appointment to the pilot</div><div class='del'>-	 */</div><div class='del'>-	rec_len = pack_Appointment (a, buffer, sizeof (buffer));</div><div class='del'>-	attr &amp;= ~dlpRecAttrDirty;</div><div class='del'>-	</div><div class='del'>-	dlp_WriteRecord (</div><div class='del'>-		pilot_fd, db, 0,</div><div class='del'>-		obj-&gt;pilot_id, 0, buffer, rec_len, &amp;new_id);</div><div class='del'>-	</div><div class='del'>-	GNOME_Calendar_Repository_update_pilot_id (repo, obj-&gt;uid, new_id, ICAL_PILOT_SYNC_NONE, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	conduit_free_Appointment (a);</div><div class='del'>-	g_free (a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_cal_to_pilot (GNOME_Calendar_Repository repo, Calendar *cal, int pilot_fd)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int c = g_list_length (cal-&gt;events);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printf ("\n");</div><div class='del'>-	for (i = 0, l = cal-&gt;events; l; l = l-&gt;next, i++){</div><div class='del'>-		iCalObject *obj = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		printf ("Syncing desktop to pilot: %d/%d\r", i + 1, c);</div><div class='del'>-		fflush (stdout);</div><div class='del'>-		if (obj-&gt;pilot_status != ICAL_PILOT_SYNC_MOD){</div><div class='del'>-			g_warning ("Strange, we were supposed to get only a dirty object");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		sync_object_to_pilot (repo, obj, pilot_fd);</div><div class='del'>-	}</div><div class='del'>-	printf ("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dump_attr (int flags)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; dlpRecAttrDeleted)</div><div class='del'>-		fprintf(stderr, " Deleted");</div><div class='del'>-	if (flags &amp; dlpRecAttrDirty)</div><div class='del'>-		fprintf(stderr, " Dirty");</div><div class='del'>-	if (flags &amp; dlpRecAttrBusy)</div><div class='del'>-		fprintf(stderr, " Busy");</div><div class='del'>-	if (flags &amp; dlpRecAttrSecret)</div><div class='del'>-		fprintf(stderr, " Secret");</div><div class='del'>-	if (flags &amp; dlpRecAttrArchived)</div><div class='del'>-		fprintf(stderr, " Archive");</div><div class='del'>-	fprintf (stderr, "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_pilot (GNOME_Calendar_Repository repo, int pilot_fd)</div><div class='del'>-{</div><div class='del'>-	struct PilotUser user_info;</div><div class='del'>-	int record;</div><div class='del'>-	unsigned char buffer [65536];</div><div class='del'>-	Calendar *dirty_cal;</div><div class='del'>-	char *vcalendar_string;</div><div class='del'>-	char *error;</div><div class='del'>-	</div><div class='del'>-	printf (_("Syncing with the pilot..."));</div><div class='del'>-	dlp_ReadUserInfo (pilot_fd, &amp;user_info);</div><div class='del'>-</div><div class='del'>-	/* This informs the user of the progress on the Pilot */</div><div class='del'>-	dlp_OpenConduit (pilot_fd);</div><div class='del'>-</div><div class='del'>-	if (dlp_OpenDB (pilot_fd, 0, 0x80 | 0x40, "DatebookDB", &amp;db) &lt; 0){</div><div class='del'>-		g_warning (_("Could not open DatebookDB on the Pilot"));</div><div class='del'>-		dlp_AddSyncLogEntry (pilot_fd, _("Unable to open DatebookDB"));</div><div class='del'>-		pi_close (pilot_fd);</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 1. Pull all the records from the Pilot, and make any updates</div><div class='del'>-	 *    required on the desktop side</div><div class='del'>-	 */</div><div class='del'>-	if (!only_desktop_to_pilot){</div><div class='del'>-		for (record = 0;; record++){</div><div class='del'>-			struct Appointment a;</div><div class='del'>-			int rec_len, attr, size;</div><div class='del'>-			recordid_t id;</div><div class='del'>-			</div><div class='del'>-			rec_len = dlp_ReadRecordByIndex (</div><div class='del'>-				pilot_fd, db,</div><div class='del'>-				record, buffer, &amp;id, &amp;size, &amp;attr, 0);</div><div class='del'>-</div><div class='del'>-			if (rec_len &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			printf ("processing record %d\n", record);</div><div class='del'>-			unpack_Appointment (&amp;a, buffer, rec_len);</div><div class='del'>-			</div><div class='del'>-			if (debug_attrs)</div><div class='del'>-				dump_attr (attr);</div><div class='del'>-			</div><div class='del'>-			/* If the object was deleted, remove it from the database */</div><div class='del'>-			if (attr &amp; dlpRecAttrDeleted){</div><div class='del'>-				printf ("Deleting id %ld\n", id);</div><div class='del'>-				delete_record (repo, id);</div><div class='del'>-				conduit_free_Appointment (&amp;a);</div><div class='del'>-				dlp_DeleteRecord (pilot_fd, db, 0, id);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (attr &amp; dlpRecAttrArchived)</div><div class='del'>-				continue;</div><div class='del'>-			</div><div class='del'>-			printf ("updating record\n");</div><div class='del'>-			update_record (repo, id, &amp;a, attr);</div><div class='del'>-</div><div class='del'>-			conduit_free_Appointment (&amp;a);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * 2. Pull all the records from the Calendar, and move any new items</div><div class='del'>-	 *    to the pilot</div><div class='del'>-	 */</div><div class='del'>-	if (!only_pilot_to_desktop){</div><div class='del'>-		vcalendar_string = GNOME_Calendar_Repository_get_updated_objects (repo, &amp;ev);</div><div class='del'>-		dirty_cal = calendar_new ("Temporal",CALENDAR_INIT_NIL);</div><div class='del'>-		error = calendar_load_from_memory (dirty_cal, vcalendar_string);</div><div class='del'>-		if (!error)</div><div class='del'>-			sync_cal_to_pilot (repo, dirty_cal, pilot_fd);</div><div class='del'>-		calendar_destroy (dirty_cal);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	dlp_CloseDB (pilot_fd, db);</div><div class='del'>-	dlp_AddSyncLogEntry (pilot_fd, _("Synced DateBook from Pilot to GnomeCal"));</div><div class='del'>-	pi_close (pilot_fd);</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'>-	int link;</div><div class='del'>-	GNOME_Calendar_Repository repository;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	orb = gnome_CORBA_init_with_popt_table (</div><div class='del'>-		"calendar-pilot-sync", VERSION, &amp;argc, argv,</div><div class='del'>-		calendar_sync_options, 0, NULL, 0, &amp;ev);</div><div class='del'>-</div><div class='del'>-	printf ("Please, press HotSync button on the palm...");</div><div class='del'>-	fflush (stdout);</div><div class='del'>-	link = setup_connection ();</div><div class='del'>-	printf ("Connected\n");</div><div class='del'>-</div><div class='del'>-	printf ("Launching GnomeCal...");</div><div class='del'>-	fflush (stdout);</div><div class='del'>-	repository = locate_calendar_server ();</div><div class='del'>-	printf ("Done\n");</div><div class='del'>-</div><div class='del'>-	printf ("&lt;Syncing&gt;\n");</div><div class='del'>-	sync_pilot (repository, link);</div><div class='del'>-	printf ("&lt;/Syncing&gt;\n");</div><div class='del'>-	</div><div class='del'>-	GNOME_Calendar_Repository_done (repository, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Just a stub to link with */</div><div class='del'>-void</div><div class='del'>-calendar_notify (time_t time, CalendarAlarm *which, void *data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</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 1b178cfdfc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/component-factory.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/component-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +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  Helix Code, 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 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: 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.h&gt;</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</div><div class='del'>-#else</div><div class='del'>-#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:evolution-calendar"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ "calendar", "evolution-calendar.png" },</div><div class='del'>-	{ NULL, NULL }</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'>-	     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") != 0)</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-</div><div class='del'>-	control = control_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'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      Evolution_Shell shell_interface)</div><div class='del'>-{</div><div class='del'>-	g_print ("evolution-calendar: Yeeeh! We have an owner!\n"); /* FIXME */</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 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'>-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL);</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'>-</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'>-	if (factory != NULL)</div><div class='del'>-		return;</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'>-		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 f83a849452..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/component-factory.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/component-factory.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'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Helix Code, 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 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: 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 /* _COMPONENT_FACTORY_H_ */</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 bbfe796ce7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/control-factory.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/control-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,192 +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  Helix Code, 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 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: 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;config.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.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 &lt;gui/alarm.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'>-</div><div class='del'>-#define PROPERTY_CALENDAR_URI_IDX 1</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"</div><div class='del'>-#else</div><div class='del'>-#define CONTROL_FACTORY_ID   "control-factory:calendar"</div><div class='del'>-#endif</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, </div><div class='del'>-		     gboolean activate, </div><div class='del'>-		     gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	if (activate)</div><div class='del'>-		calendar_control_activate (control, user_data);</div><div class='del'>-	else</div><div class='del'>-		calendar_control_deactivate (control);</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,</div><div class='del'>-	  BonoboArg         *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	/*GnomeCalendar *gcal = user_data;*/</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'>-		/*</div><div class='del'>-		if (fb &amp;&amp; fb-&gt;uri)</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, fb-&gt;uri);</div><div class='del'>-		else</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "");</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'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = user_data;</div><div class='del'>-	char *filename;</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'>-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		filename = g_strdup_printf ("%s/calendar.vcf",</div><div class='del'>-					    BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		calendar_set_uri (gcal, filename);</div><div class='del'>-		g_free (filename);</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)</div><div class='del'>-{</div><div class='del'>-	gcal-&gt;properties = bonobo_property_bag_new (get_prop, set_prop, gcal);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (gcal-&gt;properties,</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'>-</div><div class='del'>-	bonobo_control_set_property_bag (gcal-&gt;control, gcal-&gt;properties);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboControl *</div><div class='del'>-create_control (void)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	GnomeCalendar *cal;</div><div class='del'>-</div><div class='del'>-	cal = new_calendar (full_name, NULL, NULL, 0);</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (cal));</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (GTK_WIDGET (cal));</div><div class='del'>-	cal-&gt;control = control;</div><div class='del'>-</div><div class='del'>-	calendar_properties_init (cal);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-			    control_activate_cb, cal);</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'>-static BonoboObject *</div><div class='del'>-control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (create_control ());</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'>-	puts ("XXXXXX - initializing calendar factory!!!");</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, 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 Calendar control factory.");</div><div class='del'>-}</div><div class='del'>-</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'>-	return create_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 bacd2d3d90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/control-factory.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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  Helix Code, 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 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: Federico Mena Quintero</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/dayview.xpm b/calendar/gui/dayview.xpm<br/>deleted file mode 100644<br/>index bc8e74e4d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dayview.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dayview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * dayview_xpm[] = {</div><div class='del'>-"24 24 15 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D1D1D1",</div><div class='del'>-"#	c #AAAFE2",</div><div class='del'>-"$	c #C7CAEB",</div><div class='del'>-"%	c #A3A6C7",</div><div class='del'>-"&amp;	c #0010A8",</div><div class='del'>-"*	c #555FC5",</div><div class='del'>-"=	c #1725AC",</div><div class='del'>-"-	c #4550B5",</div><div class='del'>-";	c #E3E4F5",</div><div class='del'>-"&gt;	c #8B90C3",</div><div class='del'>-",	c #3945BB",</div><div class='del'>-"'	c #BABBCC",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-" ...................... ",</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;-@@@@@@@@@. ",</div><div class='del'>-" .++@++@++@&amp;*@++@++@++. ",</div><div class='del'>-" .++@++@++@&amp;*@++@++@++. ",</div><div class='del'>-" .@@@@@@@@@&amp;-@@@@@@@@@. ",</div><div class='del'>-" .++@++@++@&amp;*@++@++@++. ",</div><div class='del'>-" .++@++@+;&gt;&amp;,&gt;++@++@++. ",</div><div class='del'>-" .@@@@@@@'&gt;&gt;&gt;&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/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore<br/>deleted file mode 100644<br/>index e995588475..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dialogs/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</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 6caf99e8f5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dialogs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-gladedir = $(datadir)/evolution/glade</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)/libical/src/libical		\</div><div class='del'>-	-I$(includedir)					\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)			\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"</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'>-	alarm-notify-dialog.c	\</div><div class='del'>-	alarm-notify-dialog.h</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'>-glade_messages =		\</div><div class='del'>-	alarm-notify.glade.h</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	$(glade_messages)</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-notify-dialog.c b/calendar/gui/dialogs/alarm-notify-dialog.c<br/>deleted file mode 100644<br/>index 931ab0bfac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-notify-dialog.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dialogs/alarm-notify-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.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;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "alarm-notify-dialog.h"</div><div class='del'>-</div><div class='del'>-</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 *summary;</div><div class='del'>-	GtkWidget *snooze_time;</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'>-/**</div><div class='del'>- * alarm_notify_dialog:</div><div class='del'>- * @func: Function to be called when a dialog action is invoked.</div><div class='del'>- * @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, iCalObject *ico,</div><div class='del'>-		     AlarmNotifyFunc func, gpointer func_data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-	char buf[256];</div><div class='del'>-	struct tm tm_trigger;</div><div class='del'>-	struct tm tm_occur;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (trigger != -1, FALSE);</div><div class='del'>-	g_return_val_if_fail (occur != -1, FALSE);</div><div class='del'>-	g_return_val_if_fail (ico != 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;summary = glade_xml_get_widget (an-&gt;xml, "summary");</div><div class='del'>-	an-&gt;snooze_time = glade_xml_get_widget (an-&gt;xml, "snooze-time");</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;summary</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'>-	/* FIXME: use am_pm_flag or 24-hour time */</div><div class='del'>-</div><div class='del'>-	tm_trigger = *localtime (&amp;trigger);</div><div class='del'>-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &amp;tm_trigger);</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (an-&gt;dialog), buf);</div><div class='del'>-</div><div class='del'>-	/* Heading */</div><div class='del'>-</div><div class='del'>-	tm_occur = *localtime (&amp;occur);</div><div class='del'>-	strftime (buf, sizeof (buf),</div><div class='del'>-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),</div><div class='del'>-		  &amp;tm_occur);</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (an-&gt;heading), buf);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (an-&gt;summary), ico-&gt;summary);</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'>-	gtk_widget_show (an-&gt;dialog);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-notify-dialog.h b/calendar/gui/dialogs/alarm-notify-dialog.h<br/>deleted file mode 100644<br/>index 770768f59c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-notify-dialog.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dialogs/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) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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/calobj.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, iCalObject *ico,</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/dialogs/alarm-notify.glade b/calendar/gui/dialogs/alarm-notify.glade<br/>deleted file mode 100644<br/>index 32d7e03f8b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-notify.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dialogs/alarm-notify.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +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;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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;alarm-notify.glade.h&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;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;alarm-notify&lt;/name&gt;</div><div class='del'>-  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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'>-      &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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;summary&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;&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'>-      &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;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;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;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;label&gt;Close&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;snooze&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;label&gt;Snooze&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;edit&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;label&gt;Edit appointment&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'>-    &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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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/dialogs/alarm-notify.glade.h b/calendar/gui/dialogs/alarm-notify.glade.h<br/>deleted file mode 100644<br/>index c7b8918e06..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-notify.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/dialogs/alarm-notify.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Close");</div><div class='del'>-gchar *s = N_("Snooze");</div><div class='del'>-gchar *s = N_("Edit appointment");</div><div class='del'>-gchar *s = N_("Snooze time (minutes)");</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 b3a531f62e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-main-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-day-view-main-item.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'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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-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 *fg_gc, *bg_gc, *light_gc, *dark_gc, *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 work_day_x, work_day_w;</div><div class='del'>-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;</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'>-	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'>-</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'>-	work_day_x = day_view-&gt;day_offsets[0] - x;</div><div class='del'>-	work_day_w = width - work_day_x;</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'>-			    work_day_x, 0 - y,</div><div class='del'>-			    work_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'>-			    work_day_x, work_day_start_y,</div><div class='del'>-			    work_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'>-			    work_day_x, work_day_end_y,</div><div class='del'>-			    work_day_w, height - work_day_end_y);</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'>-			gc = style-&gt;bg_gc[GTK_STATE_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'>-	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, dark_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, fg_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, fg_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'>-</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'>-		/* 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'>-</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 (!e_day_view_find_long_event_days (day_view, event,</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'>-	iCalObject *ico;</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;</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 0</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'>-	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'>-	/* 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'>-	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'>-	ico = event-&gt;ico;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;dalarm.enabled || ico-&gt;malarm.enabled</div><div class='del'>-	    || ico-&gt;palarm.enabled || ico-&gt;aalarm.enabled) {</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 (ico-&gt;recur) {</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 (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'>-		gdk_gc_set_clip_mask (gc, NULL);</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 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 d8305e594d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-main-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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 c2dcf55727..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-time-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-day-view-time-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,531 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkradiomenuitem.h&gt;</div><div class='del'>-#include "e-day-view-time-item.h"</div><div class='del'>-#include "../../e-util/e-gui-utils.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'>-#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'>-</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_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'>-</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'>-	/* Calculate the width of each time column. */</div><div class='del'>-	if (day_view-&gt;mins_per_row == 60) {</div><div class='del'>-		dvtmitem-&gt;column_width = day_view-&gt;max_small_hour_width</div><div class='del'>-			+ day_view-&gt;colon_width</div><div class='del'>-			+ day_view-&gt;max_minute_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'>-	} else {</div><div class='del'>-		dvtmitem-&gt;column_width = day_view-&gt;max_large_hour_width</div><div class='del'>-			+ day_view-&gt;max_minute_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'>-</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'>-	gint time_hour_x1, time_hour_x2, time_min_x1;</div><div class='del'>-	gint hour, minute, hour_y, min_y, hour_r, min_r, start_y;</div><div class='del'>-	gint row, row_y, min_width, hour_width;</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[16];</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'>-	/* Step through each row, drawing the horizontal grid lines for each</div><div class='del'>-	   day column and the times. */</div><div class='del'>-	time_hour_x1 = E_DVTMI_TIME_GRID_X_PAD - x;</div><div class='del'>-	time_hour_x2 = dvtmitem-&gt;column_width - E_DVTMI_TIME_GRID_X_PAD - x;</div><div class='del'>-	if (day_view-&gt;mins_per_row == 60) {</div><div class='del'>-		min_r = time_hour_x2 - E_DVTMI_60_MIN_X_PAD;</div><div class='del'>-	} else {</div><div class='del'>-		time_min_x1 = time_hour_x2 - E_DVTMI_MIN_X_PAD * 2</div><div class='del'>-			- day_view-&gt;max_minute_width;</div><div class='del'>-		hour_r = time_min_x1 - E_DVTMI_HOUR_R_PAD;</div><div class='del'>-		min_r = time_hour_x2 - E_DVTMI_MIN_X_PAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hour = day_view-&gt;first_hour_shown;</div><div class='del'>-	hour_y = large_font-&gt;ascent + 2; /* FIXME */</div><div class='del'>-	minute = day_view-&gt;first_minute_shown;</div><div class='del'>-	min_y = small_font-&gt;ascent + 2; /* FIXME */</div><div class='del'>-	start_y = 0 - MAX (day_view-&gt;row_height, hour_y + large_font-&gt;descent);</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; start_y) {</div><div class='del'>-			/* Draw the times down the left if needed. */</div><div class='del'>-			if (min_r &lt;= 0)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (day_view-&gt;mins_per_row == 60) {</div><div class='del'>-				gdk_draw_line (drawable, dark_gc,</div><div class='del'>-					       time_hour_x1, row_y,</div><div class='del'>-					       time_hour_x2, row_y);</div><div class='del'>-				sprintf (buffer, "%02i:%02i", hour, minute);</div><div class='del'>-				min_width = day_view-&gt;small_hour_widths[hour] + day_view-&gt;minute_widths[minute / 5] + day_view-&gt;colon_width;</div><div class='del'>-				gdk_draw_string (drawable, small_font, fg_gc,</div><div class='del'>-						 min_r - min_width,</div><div class='del'>-						 row_y + min_y, buffer);</div><div class='del'>-			} else {</div><div class='del'>-				if (minute == 0) {</div><div class='del'>-					gdk_draw_line (drawable, dark_gc,</div><div class='del'>-						       time_hour_x1, row_y,</div><div class='del'>-						       time_hour_x2, row_y);</div><div class='del'>-					sprintf (buffer, "%02i", hour);</div><div class='del'>-					hour_width = day_view-&gt;large_hour_widths[hour];</div><div class='del'>-					gdk_draw_string (drawable, large_font,</div><div class='del'>-							 fg_gc,</div><div class='del'>-							 hour_r - hour_width,</div><div class='del'>-							 row_y + hour_y,</div><div class='del'>-							 buffer);</div><div class='del'>-				} else {</div><div class='del'>-					gdk_draw_line (drawable, dark_gc,</div><div class='del'>-						       time_min_x1, row_y,</div><div class='del'>-						       time_hour_x2, row_y);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (day_view-&gt;mins_per_row != 30</div><div class='del'>-				    || minute != 30) {</div><div class='del'>-					sprintf (buffer, "%02i", minute);</div><div class='del'>-					min_width = day_view-&gt;minute_widths[minute / 5];</div><div class='del'>-					gdk_draw_string (drawable, small_font,</div><div class='del'>-							 fg_gc,</div><div class='del'>-							 min_r - min_width,</div><div class='del'>-							 row_y + min_y,</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'>-		minute += day_view-&gt;mins_per_row;</div><div class='del'>-		if (minute &gt;= 60) {</div><div class='del'>-			hour++;</div><div class='del'>-			minute -= 60;</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 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'>-		sprintf (buffer, _("%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'>-}</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 8b20fe999e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-time-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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 45872238a7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-top-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-day-view-top-item.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 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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 "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 *fg_gc, *bg_gc, *light_gc, *dark_gc;</div><div class='del'>-	gchar buffer[128];</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;</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'>-	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'>-	/* Clear the entire background. */</div><div class='del'>-	gdk_draw_rectangle (drawable, dark_gc, TRUE,</div><div class='del'>-			    left_edge - x, 0,</div><div class='del'>-			    canvas_width - left_edge, 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'>-		       left_edge + 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'>-		       left_edge + 1 - x, 2 - y,</div><div class='del'>-		       left_edge + 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'>-	/* 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_draw_rectangle (drawable, style-&gt;white_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 = localtime (&amp;day_view-&gt;day_starts[day]);</div><div class='del'>-</div><div class='del'>-		if (day_view-&gt;date_format == E_DAY_VIEW_DATE_FULL)</div><div class='del'>-			strftime (buffer, 128, "%d %B", day_start);</div><div class='del'>-		else if (day_view-&gt;date_format == E_DAY_VIEW_DATE_ABBREVIATED)</div><div class='del'>-			strftime (buffer, 128, "%d %b", day_start);</div><div class='del'>-		else</div><div class='del'>-			strftime (buffer, 128, "%d", 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_draw_line (drawable, style-&gt;black_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'>-	iCalObject *ico;</div><div class='del'>-	gchar buffer[16];</div><div class='del'>-	gint hour, minute, offset, time_width, time_x, min_end_time_x;</div><div class='del'>-	gboolean draw_start_triangle, draw_end_triangle;</div><div class='del'>-	GdkRectangle clip_rect;</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'>-	ico = event-&gt;ico;</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_draw_line (drawable, fg_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, fg_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_draw_rectangle (drawable, bg_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_draw_line (drawable, fg_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_draw_line (drawable, fg_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 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 - icon_x_inc - x;</div><div class='del'>-	icon_y = item_y + 1 + E_DAY_VIEW_ICON_Y_PAD - y;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;recur) {</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 (ico-&gt;dalarm.enabled || ico-&gt;malarm.enabled</div><div class='del'>-	    || ico-&gt;palarm.enabled || ico-&gt;aalarm.enabled) {</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'>-	gdk_gc_set_clip_mask (gc, NULL);</div><div class='del'>-</div><div class='del'>-	/* Draw the start &amp; end times, if necessary.</div><div class='del'>-	   Note that GtkLabel adds 1 to the ascent so we must do that to be</div><div class='del'>-	   level with it. */</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'>-	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'>-		sprintf (buffer, "%02i:%02i", hour, minute);</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'>-		gdk_draw_string (drawable, font, fg_gc,</div><div class='del'>-				 item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x,</div><div class='del'>-				 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + font-&gt;ascent + 1 - 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 += day_view-&gt;small_hour_widths[hour] + 2</div><div class='del'>-			+ day_view-&gt;max_minute_width + day_view-&gt;colon_width;</div><div class='del'>-	}</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_width = day_view-&gt;small_hour_widths[hour]</div><div class='del'>-			+ day_view-&gt;max_minute_width + day_view-&gt;colon_width;</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'>-			sprintf (buffer, "%02i:%02i", hour, minute);</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'>-	}</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 *fg_gc, *bg_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'>-	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'>-</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_draw_polygon (drawable, bg_gc, TRUE, points, 3);</div><div class='del'>-	gdk_draw_line (drawable, fg_gc, x, y, x + w, c1);</div><div class='del'>-	gdk_draw_line (drawable, fg_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 435ef12b58..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-top-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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 ab789437e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-day-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5545 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gdk/gdkx.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "e-day-view.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-main-item.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "popup-menu.h"</div><div class='del'>-#include "../e-util/e-canvas.h"</div><div class='del'>-#include "../widgets/e-text/e-text.h"</div><div class='del'>-#include "e-util/e-canvas-utils.h"</div><div class='del'>-</div><div class='del'>-/* Images */</div><div class='del'>-#include "bell.xpm"</div><div class='del'>-#include "recur.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'>-/* 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'>-</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'>-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'>-</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_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_reload_events (EDayView *day_view);</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 (iCalObject *ico,</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_layout_long_events (EDayView *day_view);</div><div class='del'>-static void e_day_view_layout_long_event (EDayView	   *day_view,</div><div class='del'>-					  EDayViewEvent *event,</div><div class='del'>-					  guint8	   *grid);</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_layout_day_events (EDayView *day_view,</div><div class='del'>-					  gint	day);</div><div class='del'>-static void e_day_view_layout_day_event (EDayView   *day_view,</div><div class='del'>-					 gint	    day,</div><div class='del'>-					 EDayViewEvent *event,</div><div class='del'>-					 guint8	   *grid,</div><div class='del'>-					 guint16   *group_starts);</div><div class='del'>-static void e_day_view_expand_day_event (EDayView	   *day_view,</div><div class='del'>-					 gint	    day,</div><div class='del'>-					 EDayViewEvent *event,</div><div class='del'>-					 guint8	   *grid);</div><div class='del'>-static void e_day_view_recalc_cols_per_row (EDayView *day_view,</div><div class='del'>-					    gint      day,</div><div class='del'>-					    guint16  *group_starts);</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'>-static 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'>-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_edit_appointment (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_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'>-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'>-</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_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'>-	/* 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'>-</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'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_DAY_VIEW_COLOR_LAST];</div><div class='del'>-	gint day, nfailed;</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'>-	colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-	day_view-&gt;calendar = 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'>-	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'>-	/* FIXME: Initialize day_starts. */</div><div class='del'>-	day_view-&gt;days_shown = 1;</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;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;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'>-	day_view-&gt;editing_new_event = FALSE;</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'>-	/* 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'>-</div><div class='del'>-	/* Allocate the colors. */</div><div class='del'>-#if 1</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'>-#else</div><div class='del'>-</div><div class='del'>-	/* FG: MistyRose1, LightPink3 | RosyBrown | MistyRose3. */</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].red   = 255 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 228 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].blue  = 225 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red   = 238 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 162 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue  = 173 * 257;</div><div class='del'>-#endif</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'>-	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'>-</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'>-				       "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'>-	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'>-				       "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'>-	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'>-				       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'>-				       "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'>-	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'>-				       "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'>-	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'>-				       "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'>-	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'>-				       "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'>-	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'>-				       "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'>-	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'>-				       "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'>-	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'>-				       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'>-</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 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'>-</div><div class='del'>-</div><div class='del'>-	/* Create the cursors. */</div><div class='del'>-	day_view-&gt;normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);</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);</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);</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_stop_auto_scroll (day_view);</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'>-</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'>-	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'>-</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'>-</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'>-</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'>-</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'>-	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 month, max_month_width, max_abbr_month_width, number_width;</div><div class='del'>-	gint hour, max_large_hour_width, month_width;</div><div class='del'>-	gint minute, max_minute_width, i;</div><div class='del'>-	GDate date;</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 * 2 + 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 biggest full month name. */</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, 20, 1, 2000);</div><div class='del'>-	max_month_width = 0;</div><div class='del'>-	max_abbr_month_width = 0;</div><div class='del'>-	for (month = 1; month &lt;= 12; month++) {</div><div class='del'>-		g_date_set_month (&amp;date, month);</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'>-		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'>-		max_abbr_month_width = MAX (max_abbr_month_width, month_width);</div><div class='del'>-	}</div><div class='del'>-	number_width = gdk_string_width (font, "31 ");</div><div class='del'>-	day_view-&gt;long_format_width = number_width + max_month_width</div><div class='del'>-		+ E_DAY_VIEW_DATE_X_PAD;</div><div class='del'>-	day_view-&gt;abbreviated_format_width = number_width</div><div class='del'>-		+ max_abbr_month_width + E_DAY_VIEW_DATE_X_PAD;</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'>-		sprintf (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;large_hour_widths[hour] = gdk_string_width (day_view-&gt;large_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'>-		max_large_hour_width = MAX (max_large_hour_width, day_view-&gt;large_hour_widths[hour]);</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;max_large_hour_width = max_large_hour_width;</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'>-		sprintf (buffer, "%02i", minute);</div><div class='del'>-		day_view-&gt;minute_widths[i] = gdk_string_width (font, buffer);</div><div class='del'>-		max_minute_width = MAX (max_minute_width, day_view-&gt;minute_widths[i]);</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'>-</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'>-</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'>-	gfloat width, offset;</div><div class='del'>-	gint col, 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'>-	/* 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 (col = 0; col &lt;= day_view-&gt;days_shown; col++) {</div><div class='del'>-		day_view-&gt;day_offsets[col] = 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 (col = 0; col &lt; day_view-&gt;days_shown; col++) {</div><div class='del'>-		day_view-&gt;day_widths[col] = day_view-&gt;day_offsets[col + 1] - day_view-&gt;day_offsets[col];</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'>-	if (day_view-&gt;day_widths[0] &gt; day_view-&gt;long_format_width)</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_FULL;</div><div class='del'>-	else if (day_view-&gt;day_widths[0] &gt; day_view-&gt;abbreviated_format_width)</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_ABBREVIATED;</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'>-	/* 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 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'>-	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'>-	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'>-	/* FIXME: free current events? */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This reloads all calendar events. */</div><div class='del'>-void</div><div class='del'>-e_day_view_update_all_events	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	e_day_view_reload_events (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is called when one event has been added or updated. */</div><div class='del'>-void</div><div class='del'>-e_day_view_update_event		(EDayView	*day_view,</div><div class='del'>-				 const gchar	*uid)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	gint day, event_num;</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 0</div><div class='del'>-	/* FIXME: Just for testing. */</div><div class='del'>-	chdir ("/home/damon/tmp");</div><div class='del'>-	g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);</div><div class='del'>-</div><div class='del'>-	g_print ("In e_day_view_update_event day_view:%p uid:%s\n",</div><div class='del'>-		 day_view, uid);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If our calendar or time hasn't been set yet, just return. */</div><div class='del'>-	if (!day_view-&gt;calendar</div><div class='del'>-	    || (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;calendar-&gt;client, uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Do nothing. */</div><div class='del'>-		break;</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_warning ("syntax error uid=%s\n", uid);</div><div class='del'>-		return;</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		g_warning ("obj not found uid=%s\n", uid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We only care about events. */</div><div class='del'>-	if (ico &amp;&amp; ico-&gt;type != ICAL_EVENT) {</div><div class='del'>-		ical_object_unref (ico);</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 (ical_object_compare_dates (event-&gt;ico, ico)) {</div><div class='del'>-			g_print ("updated object's dates unchanged\n");</div><div class='del'>-			e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_update_event_cb, ico);</div><div class='del'>-			ical_object_unref (ico);</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'>-		g_print ("dates changed - removing occurrences\n");</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'>-	ical_object_generate_events (ico, day_view-&gt;lower, day_view-&gt;upper,</div><div class='del'>-				     e_day_view_add_event, day_view);</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-</div><div class='del'>-	e_day_view_check_layout (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'>-}</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'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = 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'>-	ical_object_unref (event-&gt;ico);</div><div class='del'>-	event-&gt;ico = ico;</div><div class='del'>-	ical_object_ref (ico);</div><div class='del'>-</div><div class='del'>-	/* If we are editing an event which we have just created, we will get</div><div class='del'>-	   an update_event callback from the server. But we need to ignore it</div><div class='del'>-	   or we will lose the text the user has already typed in. */</div><div class='del'>-	if (day_view-&gt;editing_new_event</div><div class='del'>-	    &amp;&amp; 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 TRUE;</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_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 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_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'>-</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'>-			if (event-&gt;ico-&gt;uid</div><div class='del'>-			    &amp;&amp; !strcmp (uid, event-&gt;ico-&gt;uid)) {</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'>-		if (event-&gt;ico-&gt;uid</div><div class='del'>-		    &amp;&amp; !strcmp (uid, event-&gt;ico-&gt;uid)) {</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'>-/* This removes all the events associated with the given uid. Note that for</div><div class='del'>-   recurring events there may be more than one. If any events are found and</div><div class='del'>-   removed we need to layout the events again. */</div><div class='del'>-void</div><div class='del'>-e_day_view_remove_event	(EDayView	*day_view,</div><div class='del'>-			 const gchar	*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'>-#if 1</div><div class='del'>-	g_print ("In e_day_view_remove_event day_view:%p uid:%s\n",</div><div class='del'>-		 day_view, uid);</div><div class='del'>-#endif</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'>-</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 1</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_num 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'>-	ical_object_unref (event-&gt;ico);</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'>-	gchar *text;</div><div class='del'>-	gboolean free_text = FALSE, editing_event = FALSE;</div><div class='del'>-	gint offset, start_minute, end_minute;</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'>-	text = event-&gt;ico-&gt;summary ? event-&gt;ico-&gt;summary : "";</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'>-		|| 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'>-		text = g_strdup_printf ("%02i:%02i-%02i:%02i %s",</div><div class='del'>-					start_minute / 60,</div><div class='del'>-					start_minute % 60,</div><div class='del'>-					end_minute / 60,</div><div class='del'>-					end_minute % 60,</div><div class='del'>-					text);</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'>-</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'>-	gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-			       "text", event-&gt;ico-&gt;summary ? event-&gt;ico-&gt;summary : "",</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'>-</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;ico-&gt;uid</div><div class='del'>-			    &amp;&amp; !strcmp (uid, event-&gt;ico-&gt;uid)) {</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;ico-&gt;uid</div><div class='del'>-		    &amp;&amp; !strcmp (uid, event-&gt;ico-&gt;uid)) {</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'>-	GDate date;</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'>-	   Monday. */</div><div class='del'>-	if (day_view-&gt;days_shown == 1)</div><div class='del'>-		lower = time_day_begin (start_time);</div><div class='del'>-	else {</div><div class='del'>-		g_date_clear (&amp;date, 1);</div><div class='del'>-		g_date_set_time (&amp;date, start_time);</div><div class='del'>-		g_date_subtract_days (&amp;date, g_date_weekday (&amp;date) - 1);</div><div class='del'>-		lower = time_from_day (g_date_year (&amp;date),</div><div class='del'>-				       g_date_month (&amp;date) - 1,</div><div class='del'>-				       g_date_day (&amp;date));</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'>-		e_day_view_reload_events (day_view);</div><div class='del'>-		need_redraw = TRUE;</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'>-/* 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 (day_view-&gt;day_starts[day - 1], 1);</div><div class='del'>-	}</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'>-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'>-		day_view-&gt;days_shown = days_shown;</div><div class='del'>-</div><div class='del'>-		/* FIXME: Update everything. */</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_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 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'>-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 (!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'>-	/* 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 (!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_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'>-			return TRUE;</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,</div><div class='del'>-						 E_DAY_VIEW_LONG_EVENT,</div><div class='del'>-						 event_num);</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'>-			return TRUE;</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,</div><div class='del'>-						 day, event_num);</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 (!event-&gt;ico-&gt;recur</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'>-		if (!e_day_view_find_long_event_days (day_view, event,</div><div class='del'>-						      &amp;start_day, &amp;end_day))</div><div class='del'>-			return;</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 (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 (!event-&gt;ico-&gt;recur</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'>-		/* 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 (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'>-</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'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_event_double_click\n");</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 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, not_being_edited, items, i;</div><div class='del'>-	struct menu_item *context_menu;</div><div class='del'>-</div><div class='del'>-	static struct menu_item main_items[] = {</div><div class='del'>-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static struct menu_item child_items[] = {</div><div class='del'>-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },</div><div class='del'>-		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },</div><div class='del'>-		{ NULL, NULL, NULL, TRUE },</div><div class='del'>-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static struct menu_item recur_child_items[] = {</div><div class='del'>-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },</div><div class='del'>-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },</div><div class='del'>-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_day_view_on_delete_occurrence, NULL, TRUE },</div><div class='del'>-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },</div><div class='del'>-		{ NULL, NULL, NULL, TRUE },</div><div class='del'>-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }</div><div class='del'>-	};</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'>-		items = 1;</div><div class='del'>-		context_menu = &amp;main_items[0];</div><div class='del'>-		context_menu[0].sensitive = have_selection;</div><div class='del'>-	} else {</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'>-		/* 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'>-		not_being_edited = TRUE;</div><div class='del'>-</div><div class='del'>-		if (event-&gt;ico-&gt;recur) {</div><div class='del'>-			items = 6;</div><div class='del'>-			context_menu = &amp;recur_child_items[0];</div><div class='del'>-			context_menu[0].sensitive = not_being_edited;</div><div class='del'>-			context_menu[1].sensitive = not_being_edited;</div><div class='del'>-			context_menu[2].sensitive = not_being_edited;</div><div class='del'>-			context_menu[3].sensitive = not_being_edited;</div><div class='del'>-			context_menu[5].sensitive = have_selection;</div><div class='del'>-		} else {</div><div class='del'>-			items = 4;</div><div class='del'>-			context_menu = &amp;child_items[0];</div><div class='del'>-			context_menu[0].sensitive = not_being_edited;</div><div class='del'>-			context_menu[1].sensitive = not_being_edited;</div><div class='del'>-			context_menu[3].sensitive = have_selection;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; items; i++)</div><div class='del'>-		context_menu[i].data = day_view;</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'>-	popup_menu (context_menu, items, bevent);</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_new_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;new = 1;</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;ico-&gt;dtstart,</div><div class='del'>-					    &amp;ico-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (day_view-&gt;calendar, ico);</div><div class='del'>-	ical_object_unref (ico);</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_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'>-	gnome_calendar_edit_object (day_view-&gt;calendar, event-&gt;ico);</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_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'>-	iCalObject *ico;</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 iCalObject, or we won't know it has changed</div><div class='del'>-	   when we get the "update_event" callback. */</div><div class='del'>-	ico = ical_object_duplicate (event-&gt;ico);</div><div class='del'>-</div><div class='del'>-	ical_object_add_exdate (ico, event-&gt;start);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;calendar-&gt;client, ico))</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'>-	ical_object_unref (ico);</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'>-</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;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 (!cal_client_remove_object (day_view-&gt;calendar-&gt;client, event-&gt;ico-&gt;uid))</div><div class='del'>-		g_message ("e_day_view_on_delete_appointment(): Could not remove the 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_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'>-	iCalObject *ico, *new_ico;</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'>-	/* For the recurring object, we add a exception to get rid of the</div><div class='del'>-	   instance. */</div><div class='del'>-	ico = ical_object_duplicate (event-&gt;ico);</div><div class='del'>-	ical_object_add_exdate (ico, event-&gt;start);</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_ico = ical_object_duplicate (event-&gt;ico);</div><div class='del'>-	g_free (new_ico-&gt;uid);</div><div class='del'>-	new_ico-&gt;uid = ical_gen_uid ();</div><div class='del'>-	ical_object_reset_recurrence (new_ico);</div><div class='del'>-	new_ico-&gt;dtstart = event-&gt;start;</div><div class='del'>-	new_ico-&gt;dtend   = event-&gt;end;</div><div class='del'>-</div><div class='del'>-	/* Now update both iCalObjects. 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;calendar-&gt;client, ico))</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'>-	ical_object_unref (ico);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;calendar-&gt;client, new_ico))</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'>-	ical_object_unref (new_ico);</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'>-		e_day_view_finish_long_event_resize (day_view);</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</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 (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'>-		e_day_view_finish_resize (day_view);</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</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'>-	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 (!event-&gt;ico-&gt;recur</div><div class='del'>-		    &amp;&amp; (abs (canvas_x - day_view-&gt;drag_event_x) &gt; E_DAY_VIEW_DRAG_START_OFFSET</div><div class='del'>-			|| abs (canvas_y - day_view-&gt;drag_event_y) &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; !event-&gt;ico-&gt;recur) {</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 (!event-&gt;ico-&gt;recur</div><div class='del'>-		    &amp;&amp; (abs (canvas_x - day_view-&gt;drag_event_x) &gt; E_DAY_VIEW_DRAG_START_OFFSET</div><div class='del'>-			|| abs (canvas_y - day_view-&gt;drag_event_y) &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; !event-&gt;ico-&gt;recur) {</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'>-	iCalObject ico;</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 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'>-	ico = *event-&gt;ico;</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'>-		ico.dtstart = day_view-&gt;day_starts[day_view-&gt;resize_start_row];</div><div class='del'>-	} else {</div><div class='del'>-		ico.dtend = day_view-&gt;day_starts[day_view-&gt;resize_end_row + 1];</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;calendar-&gt;client, &amp;ico))</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'>-</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'>-	iCalObject ico;</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'>-	ico = *event-&gt;ico;</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'>-		ico.dtstart = e_day_view_convert_grid_position_to_time (day_view, day, day_view-&gt;resize_start_row);</div><div class='del'>-	} else {</div><div class='del'>-		ico.dtend = e_day_view_convert_grid_position_to_time (day_view, day, day_view-&gt;resize_end_row + 1);</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;calendar-&gt;client, &amp;ico))</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'>-</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_reload_events (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	e_day_view_free_events (day_view);</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'>-	/* If both lower &amp; upper are 0, then the time range hasn't been set,</div><div class='del'>-	   so we don't try to load any events. */</div><div class='del'>-	if (day_view-&gt;calendar</div><div class='del'>-	    &amp;&amp; (day_view-&gt;lower != 0 || day_view-&gt;upper != 0)) {</div><div class='del'>-		calendar_iterate (day_view-&gt;calendar,</div><div class='del'>-				  day_view-&gt;lower,</div><div class='del'>-				  day_view-&gt;upper,</div><div class='del'>-				  e_day_view_add_event,</div><div class='del'>-				  day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We need to do this to make sure the top canvas is resized. */</div><div class='del'>-	day_view-&gt;long_events_need_layout = TRUE;</div><div class='del'>-</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-	e_day_view_reshape_main_canvas_resize_bars (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'>-}</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'>-	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'>-		ical_object_unref (event-&gt;ico);</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 int</div><div class='del'>-e_day_view_add_event (iCalObject *ico,</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 tm start_tm, end_tm;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</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_tm = *(localtime (&amp;start));</div><div class='del'>-	end_tm = *(localtime (&amp;end));</div><div class='del'>-</div><div class='del'>-	event.ico = ico;</div><div class='del'>-	ical_object_ref (ico);</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_tm.tm_hour * 60 + start_tm.tm_min - offset;</div><div class='del'>-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min - offset;</div><div class='del'>-</div><div class='del'>-	event.start_row_or_col = -1;</div><div class='del'>-	event.num_columns = -1;</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;</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, 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);</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_layout_long_events (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num, old_rows_in_top_display, top_canvas_height, top_rows;</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,</div><div class='del'>-		       day_view-&gt;long_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'>-	old_rows_in_top_display = day_view-&gt;rows_in_top_display;</div><div class='del'>-	day_view-&gt;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; 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'>-		e_day_view_layout_long_event (day_view, event, grid);</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'>-	/* 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'>-	if (day_view-&gt;rows_in_top_display != old_rows_in_top_display) {</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,</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'>-static void</div><div class='del'>-e_day_view_layout_long_event (EDayView	   *day_view,</div><div class='del'>-			      EDayViewEvent *event,</div><div class='del'>-			      guint8	   *grid)</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 (day_view, event,</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'>-	day_view-&gt;rows_in_top_display = MAX (day_view-&gt;rows_in_top_display,</div><div class='del'>-					     free_row + 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_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'>-	iCalObject *ico;</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'>-	ico = event-&gt;ico;</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'>-		if (ico-&gt;dalarm.enabled || ico-&gt;malarm.enabled</div><div class='del'>-		    || ico-&gt;palarm.enabled || ico-&gt;aalarm.enabled)</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (ico-&gt;recur)</div><div class='del'>-			num_icons++;</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'>-					       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;</div><div class='del'>-	time_width = day_view-&gt;max_small_hour_width + day_view-&gt;colon_width</div><div class='del'>-		+ day_view-&gt;max_minute_width;</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'>-/* 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 (EDayView	*day_view,</div><div class='del'>-				 EDayViewEvent	*event,</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; day_view-&gt;days_shown; day++) {</div><div class='del'>-		if (start_day == -1</div><div class='del'>-		    &amp;&amp; event-&gt;start &lt; day_view-&gt;day_starts[day + 1])</div><div class='del'>-			start_day = day;</div><div class='del'>-		if (event-&gt;end &gt; day_view-&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;= day_view-&gt;days_shown</div><div class='del'>-	    || end_day &lt; 0 || end_day &gt;= day_view-&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='del'>-static void</div><div class='del'>-e_day_view_layout_day_events (EDayView *day_view,</div><div class='del'>-			      gint	day)</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. */</div><div class='del'>-	for (row = 0; row &lt; day_view-&gt;rows; row++) {</div><div class='del'>-		day_view-&gt;cols_per_row[day][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, day_view-&gt;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; 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'>-		e_day_view_layout_day_event (day_view, day, event,</div><div class='del'>-					     grid, group_starts);</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 (day_view, day, 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; 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'>-		e_day_view_expand_day_event (day_view, day, event, grid);</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 (EDayView	   *day_view,</div><div class='del'>-			     gint	    day,</div><div class='del'>-			     EDayViewEvent *event,</div><div class='del'>-			     guint8	   *grid,</div><div class='del'>-			     guint16	   *group_starts)</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 / 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'>-</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;= day_view-&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, day_view-&gt;rows - 1);</div><div class='del'>-	end_row = CLAMP (end_row, 0, day_view-&gt;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'>-		day_view-&gt;cols_per_row[day][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; day_view-&gt;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 (EDayView *day_view,</div><div class='del'>-				gint	  day,</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; day_view-&gt;rows) {</div><div class='del'>-</div><div class='del'>-		max_events = 0;</div><div class='del'>-		for (row = start_row; row &lt; day_view-&gt;rows &amp;&amp; group_starts[row] == start_row; row++)</div><div class='del'>-			max_events = MAX (max_events, day_view-&gt;cols_per_row[day][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'>-			day_view-&gt;cols_per_row[day][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 (EDayView	   *day_view,</div><div class='del'>-			     gint	    day,</div><div class='del'>-			     EDayViewEvent *event,</div><div class='del'>-			     guint8	   *grid)</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 / 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'>-</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; day_view-&gt;cols_per_row[day][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'>-/* 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'>-	iCalObject *ico;</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'>-	ico = event-&gt;ico;</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'>-			if (ico-&gt;dalarm.enabled || ico-&gt;malarm.enabled</div><div class='del'>-			    || ico-&gt;palarm.enabled || ico-&gt;aalarm.enabled)</div><div class='del'>-				num_icons++;</div><div class='del'>-			if (ico-&gt;recur)</div><div class='del'>-				num_icons++;</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'>-						       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'>-static 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'>-	iCalObject *ico;</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'>-</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'>-		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 &lt; 0x20)</div><div class='del'>-		   || (keyval &gt; 0xFF)</div><div class='del'>-		   || (event-&gt;length == 0)</div><div class='del'>-		   || (event-&gt;state &amp; (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		initial_text = event-&gt;string;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add a new event covering the selected range.</div><div class='del'>-	   Note that user_name is a global variable. */</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;new = 1;</div><div class='del'>-	ico-&gt;created = time (NULL);</div><div class='del'>-	ico-&gt;last_mod = ico-&gt;created;</div><div class='del'>-</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;ico-&gt;dtstart,</div><div class='del'>-					    &amp;ico-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	/* We add the event locally and start editing it. When we get the</div><div class='del'>-	   "update_event" callback from the server, we basically ignore it.</div><div class='del'>-	   If we were to wait for the "update_event" callback it wouldn't be</div><div class='del'>-	   as responsive and we may lose a few keystrokes. */</div><div class='del'>-	e_day_view_add_event (ico, ico-&gt;dtstart, ico-&gt;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'>-	if (e_day_view_find_event_from_uid (day_view, ico-&gt;uid,</div><div class='del'>-					    &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'>-		day_view-&gt;editing_new_event = TRUE;</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 (!cal_client_update_object (day_view-&gt;calendar-&gt;client, ico))</div><div class='del'>-		g_message ("e_day_view_key_press(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	ical_object_unref (ico);</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'>-		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'>-		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'>-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 FALSE;</div><div class='del'>-	if (start_row == 0 &amp;&amp; end_row == day_view-&gt;rows)</div><div class='del'>-		return FALSE;</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 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);</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'>-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'>-		}</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'>-		/* 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'>-</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'>-</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 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 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 (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'>-	day_view-&gt;editing_new_event = FALSE;</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'>-	/* Check that the event is still valid. */</div><div class='del'>-	if (!event-&gt;ico-&gt;uid)</div><div class='del'>-		return;</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'>-</div><div class='del'>-	/* Only update the summary if necessary. */</div><div class='del'>-	if (text &amp;&amp; event-&gt;ico-&gt;summary</div><div class='del'>-	    &amp;&amp; !strcmp (text, event-&gt;ico-&gt;summary)) {</div><div class='del'>-		g_free (text);</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'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event-&gt;ico-&gt;summary)</div><div class='del'>-		g_free (event-&gt;ico-&gt;summary);</div><div class='del'>-</div><div class='del'>-	event-&gt;ico-&gt;summary = text;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;calendar-&gt;client, event-&gt;ico))</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'>-/* 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 tm *tmp_tm;</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'>-	/* We convert the start of the day to a struct tm, then set the</div><div class='del'>-	   hour and minute, then convert it back to a time_t. */</div><div class='del'>-	tmp_tm = localtime (&amp;day_view-&gt;day_starts[col]);</div><div class='del'>-</div><div class='del'>-	tmp_tm-&gt;tm_hour = minutes / 60;</div><div class='del'>-	tmp_tm-&gt;tm_min = minutes % 60;</div><div class='del'>-	tmp_tm-&gt;tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	val = mktime (tmp_tm);</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 tm *tmp_tm;</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 a struct tm,</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'>-	tmp_tm = localtime (&amp;time);</div><div class='del'>-	minutes = tmp_tm-&gt;tm_hour * 60 + tmp_tm-&gt;tm_min;</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'>-</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'>-	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'>-	*item_x = day_view-&gt;day_offsets[day] + 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 - 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'>-	*item_h = (end_row - start_row + 1) * day_view-&gt;row_height;</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'>-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 (day_view, event,</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 (day_view, event,</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'>-		if (event)</div><div class='del'>-			text = event-&gt;ico-&gt;summary;</div><div class='del'>-		else</div><div class='del'>-			text = NULL;</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'>-}</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_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'>-		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(event-&gt;canvas_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'>-		if (event)</div><div class='del'>-			text = event-&gt;ico-&gt;summary;</div><div class='del'>-		else</div><div class='del'>-			text = NULL;</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'>-}</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'>-	gchar *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'>-	event_uid = event-&gt;ico-&gt;uid;</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;</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'>-	iCalObject ico;</div><div class='del'>-</div><div class='del'>-	if ((data-&gt;length &gt;= 0) &amp;&amp; (data-&gt;format == 8)) {</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'>-			num_days = 1;</div><div class='del'>-			start_offset = 0;</div><div class='del'>-			end_offset = -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'>-				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 (day_view,</div><div class='del'>-								 event,</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 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'>-			event_uid = data-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (!event_uid || !event-&gt;ico-&gt;uid</div><div class='del'>-			    || strcmp (event_uid, event-&gt;ico-&gt;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 the ico since we</div><div class='del'>-			   don't want to change the original ico 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'>-			ico = *event-&gt;ico;</div><div class='del'>-</div><div class='del'>-			ico.dtstart = day_view-&gt;day_starts[day] + start_offset * 60;</div><div class='del'>-			if (end_offset == -1 || end_offset == 0)</div><div class='del'>-				ico.dtend = day_view-&gt;day_starts[day + num_days];</div><div class='del'>-			else</div><div class='del'>-				ico.dtend = day_view-&gt;day_starts[day + num_days - 1] + end_offset * 60;</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;calendar-&gt;client, &amp;ico))</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'>-			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;</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'>-	iCalObject ico;</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'>-	if ((data-&gt;length &gt;= 0) &amp;&amp; (data-&gt;format == 8)) {</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'>-			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 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'>-				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'>-				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'>-			if (!event_uid || !event-&gt;ico-&gt;uid</div><div class='del'>-			    || strcmp (event_uid, event-&gt;ico-&gt;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 the ico since we</div><div class='del'>-			   don't want to change the original ico 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'>-			ico = *event-&gt;ico;</div><div class='del'>-</div><div class='del'>-			ico.dtstart = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;</div><div class='del'>-			ico.dtend = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;</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;calendar-&gt;client, &amp;ico))</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'>-			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='head'>diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h<br/>deleted file mode 100644<br/>index 8e1fb29bc2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-day-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,504 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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'>-</div><div class='del'>-#include "gnome-cal.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 7 since we only show 1 week max. */</div><div class='del'>-#define E_DAY_VIEW_MAX_DAYS		7</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		8</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		8</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		0</div><div class='del'>-#define E_DAY_VIEW_ICON_Y_PAD		0</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 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 'September 12'. The abbreviated format is like</div><div class='del'>-   'Sep 12'. The short format is like '12'. The actual format used is</div><div class='del'>-   determined in style_set(), 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_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_EVENT_VBAR,</div><div class='del'>-</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_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'>-	iCalObject *ico;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-	guint8 start_row_or_col;/* The start column for normal events, or the</div><div class='del'>-				   start row for long events. */</div><div class='del'>-	guint8 num_columns;	/* 0 indicates not displayed. For long events</div><div class='del'>-				   this is just 1 if the event is shown. */</div><div class='del'>-	guint16 start_minute;	/* Offsets from the start of the display. */</div><div class='del'>-	guint16 end_minute;</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'>-	/* The start and end of the day shown. */</div><div class='del'>-	time_t lower;</div><div class='del'>-	time_t upper;</div><div class='del'>-</div><div class='del'>-	/* The number of days we are showing. Usually 1 or 5. Maybe 6 or 7. */</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'>-</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 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'>-	/* 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'>-	/* 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'>-	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 large_hour_widths[24];</div><div class='del'>-	gint small_hour_widths[24];</div><div class='del'>-	gint minute_widths[12];		/* intervals of 5 minutes. */</div><div class='del'>-	gint max_small_hour_width;</div><div class='del'>-	gint max_large_hour_width;</div><div class='del'>-	gint max_minute_width;</div><div class='del'>-	gint colon_width;</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 maximum widths of the different types of dates. */</div><div class='del'>-	gint long_format_width;</div><div class='del'>-	gint abbreviated_format_width;</div><div class='del'>-</div><div class='del'>-	/* The large font use 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'>-</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 TRUE if we are editing an event which we have just created.</div><div class='del'>-	   We ignore the "update_event" callback which we will get from the</div><div class='del'>-	   server when the event is added. */</div><div class='del'>-	gboolean editing_new_event;</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'>-</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'>-</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'>-</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'>-/* 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'>-/* This reloads all calendar events. */</div><div class='del'>-void       e_day_view_update_all_events		(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-/* This is called when one event has been added or updated. */</div><div class='del'>-void       e_day_view_update_event		(EDayView	*day_view,</div><div class='del'>-						 const gchar	*uid);</div><div class='del'>-</div><div class='del'>-/* This removes all the events associated with the given uid. Note that for</div><div class='del'>-   recurring events there may be more than one. If any events are found and</div><div class='del'>-   removed we need to layout the events again. */</div><div class='del'>-void	   e_day_view_remove_event		(EDayView	*day_view,</div><div class='del'>-						 const gchar	*uid);</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'>-</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'>-gboolean   e_day_view_find_long_event_days	(EDayView	*day_view,</div><div class='del'>-						 EDayViewEvent	*event,</div><div class='del'>-						 gint		*start_day,</div><div class='del'>-						 gint		*end_day);</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'>-#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-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c<br/>deleted file mode 100644<br/>index 8b4aea1d2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-event-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-week-view-event-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,750 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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'>-#include "../widgets/e-text/e-text.h"</div><div class='del'>-#include "e-week-view-event-item.h"</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_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 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 *fg_gc, *gc;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint x1, y1, x2, y2, time_x, time_y, time_y_small_min;</div><div class='del'>-	gint icon_x, icon_y, time_width, min_end_time_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_minute, end_minute;</div><div class='del'>-	gchar buffer[128];</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'>-	font = style-&gt;font;</div><div class='del'>-	fg_gc = style-&gt;fg_gc[GTK_STATE_NORMAL];</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_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;</div><div class='del'>-	start_minute = event-&gt;start_minute;</div><div class='del'>-	end_minute = event-&gt;end_minute;</div><div class='del'>-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD + font-&gt;ascent;</div><div class='del'>-	if (week_view-&gt;small_font)</div><div class='del'>-		time_y_small_min = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-			+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD</div><div class='del'>-			+ week_view-&gt;small_font-&gt;ascent;</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'>-	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'>-		/* Convert the time into a string. We use different parts of</div><div class='del'>-		   the string for the different time formats. Notice that the</div><div class='del'>-		   string is always 11 characters long. */</div><div class='del'>-		sprintf (buffer, "%02i:%02i %02i:%02i",</div><div class='del'>-			 start_minute / 60, start_minute % 60,</div><div class='del'>-			 end_minute / 60, end_minute % 60);</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'>-			gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-				       time_x, time_y, buffer, 2);</div><div class='del'>-			gdk_draw_text (drawable, week_view-&gt;small_font, fg_gc,</div><div class='del'>-				       time_x + week_view-&gt;digit_width * 2,</div><div class='del'>-				       time_y_small_min, buffer + 3, 2);</div><div class='del'>-			gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-				       time_x + week_view-&gt;digit_width * 4 - 2,</div><div class='del'>-				       time_y, buffer + 6, 2);</div><div class='del'>-			gdk_draw_text (drawable, week_view-&gt;small_font, fg_gc,</div><div class='del'>-				       time_x + week_view-&gt;digit_width * 6 - 2,</div><div class='del'>-				       time_y_small_min, buffer + 9, 2);</div><div class='del'>-</div><div class='del'>-			icon_x = x1 + time_width * 2 + week_view-&gt;space_width</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;</div><div class='del'>-			break;</div><div class='del'>-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:</div><div class='del'>-			gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-				       time_x, time_y, buffer, 2);</div><div class='del'>-			gdk_draw_text (drawable, week_view-&gt;small_font, fg_gc,</div><div class='del'>-				       time_x + week_view-&gt;digit_width * 2,</div><div class='del'>-				       time_y_small_min, buffer + 3, 2);</div><div class='del'>-</div><div class='del'>-			icon_x = x1 + time_width</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;</div><div class='del'>-			break;</div><div class='del'>-		case E_WEEK_VIEW_TIME_BOTH:</div><div class='del'>-			gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-				       time_x, time_y, buffer, 11);</div><div class='del'>-			icon_x = x1 + time_width * 2 + week_view-&gt;space_width</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;</div><div class='del'>-			break;</div><div class='del'>-		case E_WEEK_VIEW_TIME_START:</div><div class='del'>-			gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-				       time_x, time_y, buffer, 5);</div><div class='del'>-			icon_x = x1 + time_width</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;</div><div class='del'>-			break;</div><div class='del'>-		case E_WEEK_VIEW_TIME_NONE:</div><div class='del'>-			icon_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;</div><div class='del'>-			break;</div><div class='del'>-		}</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'>-		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 necessary. */</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_TEXT_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'>-			sprintf (buffer, "%02i:%02i",</div><div class='del'>-				 start_minute / 60, start_minute % 60);</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_TEXT_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 (fg_gc, &amp;clip_rect);</div><div class='del'>-</div><div class='del'>-			if (week_view-&gt;use_small_font</div><div class='del'>-			    &amp;&amp; week_view-&gt;small_font) {</div><div class='del'>-				gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-					       time_x, time_y, buffer, 2);</div><div class='del'>-				gdk_draw_text (drawable, week_view-&gt;small_font,</div><div class='del'>-					       fg_gc,</div><div class='del'>-					       time_x + week_view-&gt;digit_width * 2,</div><div class='del'>-					       time_y_small_min,</div><div class='del'>-					       buffer + 3, 2);</div><div class='del'>-			} else {</div><div class='del'>-				gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-					       time_x, time_y, buffer, 5);</div><div class='del'>-			}</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 + 2;</div><div class='del'>-		}</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'>-			sprintf (buffer, "%02i:%02i",</div><div class='del'>-				 end_minute / 60, end_minute % 60);</div><div class='del'>-			time_x = x2 - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - 1</div><div class='del'>-				- time_width;</div><div class='del'>-</div><div class='del'>-			if (time_x &gt;= min_end_time_x) {</div><div class='del'>-				if (week_view-&gt;use_small_font</div><div class='del'>-				    &amp;&amp; week_view-&gt;small_font) {</div><div class='del'>-					gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-						       time_x, time_y,</div><div class='del'>-						       buffer, 2);</div><div class='del'>-					gdk_draw_text (drawable,</div><div class='del'>-						       week_view-&gt;small_font,</div><div class='del'>-						       fg_gc,</div><div class='del'>-						       time_x + week_view-&gt;digit_width * 2,</div><div class='del'>-						       time_y_small_min,</div><div class='del'>-						       buffer + 3, 2);</div><div class='del'>-				} else {</div><div class='del'>-					gdk_draw_text (drawable, font, fg_gc,</div><div class='del'>-						       time_x, time_y,</div><div class='del'>-						       buffer, 5);</div><div class='del'>-				}</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'>-			icon_x = span-&gt;text_item-&gt;x1 - 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'>-							   x2, 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_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'>-	iCalObject *ico;</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'>-</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'>-	ico = event-&gt;ico;</div><div class='del'>-</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;dalarm.enabled || ico-&gt;malarm.enabled</div><div class='del'>-	    || ico-&gt;palarm.enabled || ico-&gt;aalarm.enabled) {</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 (ico-&gt;recur) {</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'>-	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'>-	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_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'>-	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'>-	if (bevent-&gt;button.button == 1) {</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'>-	} 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'>-</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_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 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_TEXT_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 - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-		    - E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-		    - E_WEEK_VIEW_EVENT_TEXT_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 cfe58699b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-event-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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-main-item.c b/calendar/gui/e-week-view-main-item.c<br/>deleted file mode 100644<br/>index 49c2ca3d7d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-main-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-week-view-main-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,367 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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'>-#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;display_month ? E_WEEK_VIEW_MAX_WEEKS * 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 *fg_gc, *bg_gc, *light_gc, *dark_gc, *gc, *date_gc;</div><div class='del'>-	GdkGC *selected_fg_gc, *selected_bg_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'>-	fg_gc = style-&gt;fg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	bg_gc = style-&gt;bg_gc[GTK_STATE_PRELIGHT];</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'>-	selected_fg_gc = style-&gt;fg_gc[GTK_STATE_SELECTED];</div><div class='del'>-	selected_bg_gc = style-&gt;bg_gc[GTK_STATE_SELECTED];</div><div class='del'>-	gc = week_view-&gt;main_gc;</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;display_month &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_draw_line (drawable, fg_gc,</div><div class='del'>-		       right_edge, y, right_edge, bottom_edge);</div><div class='del'>-	gdk_draw_line (drawable, fg_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'>-		if (week_view-&gt;display_month)</div><div class='del'>-			gdk_draw_rectangle (drawable, selected_bg_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, selected_bg_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'>-	/* 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;display_month) {</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_abbr_day_width +</div><div class='del'>-		    week_view-&gt;digit_width * 2 + week_view-&gt;space_width * 2</div><div class='del'>-		    + week_view-&gt;month_widths[month - 1] &lt; max_width)</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'>-			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'>-			format_string = "%d %b";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_date_strftime (buffer, 128, format_string ? format_string : "%d",</div><div class='del'>-			 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'>-		date_gc = selected_fg_gc;</div><div class='del'>-	else</div><div class='del'>-		date_gc = fg_gc;</div><div class='del'>-	gdk_draw_string (drawable, font, date_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;display_month) {</div><div class='del'>-		gdk_draw_line (drawable, fg_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 f75dcb0ec9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-main-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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 14f47e4bcf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-titles-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-week-view-titles-item.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'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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'>-</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'>-	g_date_set_dmy (&amp;date, 27, 3, 2000);	/* Must be a Monday. */</div><div class='del'>-	for (col = 0; col &lt; week_view-&gt;columns; col++) {</div><div class='del'>-		if (col == 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 (col == 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[col];</div><div class='del'>-		else</div><div class='del'>-			date_width = week_view-&gt;abbr_day_widths[col];</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'>-		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 7ce1ccd386..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-titles-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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 db27ef3404..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-week-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2838 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-/*</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'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;gnome.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 "calendar-commands.h"</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-#include "e-week-view-event-item.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 &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "popup-menu.h"</div><div class='del'>-#include "../e-util/e-canvas.h"</div><div class='del'>-#include "../widgets/e-text/e-text.h"</div><div class='del'>-#include "e-util/e-canvas-utils.h"</div><div class='del'>-</div><div class='del'>-/* Images */</div><div class='del'>-#include "bell.xpm"</div><div class='del'>-#include "recur.xpm"</div><div class='del'>-</div><div class='del'>-#include "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'>-/* 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'>-#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'>-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_reload_events (EWeekView *week_view);</div><div class='del'>-static void e_week_view_free_events (EWeekView *week_view);</div><div class='del'>-static int e_week_view_add_event (iCalObject *ico,</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_layout_events (EWeekView *week_view);</div><div class='del'>-static void e_week_view_layout_event (EWeekView	   *week_view,</div><div class='del'>-				      EWeekViewEvent   *event,</div><div class='del'>-				      guint8	   *grid,</div><div class='del'>-				      GArray	   *spans);</div><div class='del'>-static void e_week_view_ensure_events_sorted (EWeekView *week_view);</div><div class='del'>-static gint e_week_view_event_sort_func (const void *arg1,</div><div class='del'>-					 const void *arg2);</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 gint e_week_view_find_day (EWeekView *week_view,</div><div class='del'>-				  time_t time_to_find,</div><div class='del'>-				  gboolean include_midnight_in_prev_day);</div><div class='del'>-static gint e_week_view_find_span_end (EWeekView *week_view,</div><div class='del'>-				       gint day);</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_edit_appointment (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_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'>-</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_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'>-	/* 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'>-</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'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_WEEK_VIEW_COLOR_LAST];</div><div class='del'>-	gint nfailed;</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'>-	colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));</div><div class='del'>-</div><div class='del'>-	week_view-&gt;calendar = 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;spans = NULL;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;display_month = FALSE;</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'>-</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'>-	week_view-&gt;editing_new_event = FALSE;</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'>-	/* Allocate the colors. */</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 0xeded;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xeded;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xeded;</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   = 0xd6d6;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 0xd6d6;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 0xd6d6;</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'>-	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'>-	/*</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'>-</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'>-</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'>-</div><div class='del'>-</div><div class='del'>-	/* Create the cursors. */</div><div class='del'>-	week_view-&gt;normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);</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'>-</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'>-	/* FIXME: free the colors. In EDayView as well. */</div><div class='del'>-	/* FIXME: free the events and the spans. In EDayView as well? */</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'>-</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'>-	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'>-</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'>-</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'>-</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'>-	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'>-	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'>-	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'>-	/* 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'>-</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'>-	gint width, height, time_width;</div><div class='del'>-	gdouble old_x2, old_y2, new_x2, new_y2;</div><div class='del'>-	GdkFont *font;</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'>-	(*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'>-	/* 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;display_month) {</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'>-	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'>-		time_width = week_view-&gt;digit_width * 2</div><div class='del'>-			+ week_view-&gt;small_digit_width * 2;</div><div class='del'>-		if (width / 2 &gt; time_width * 2 + week_view-&gt;space_width)</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'>-		time_width = week_view-&gt;digit_width * 4</div><div class='del'>-			+ week_view-&gt;colon_width;</div><div class='del'>-		if (width / 2 &gt; time_width * 2 + week_view-&gt;space_width)</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'>-	/* 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 width, height, offset;</div><div class='del'>-	gint row, col;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;display_month) {</div><div class='del'>-		week_view-&gt;rows = 10;</div><div class='del'>-		week_view-&gt;columns = 6;</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'>-	width = week_view-&gt;main_canvas-&gt;allocation.width + 1;</div><div class='del'>-	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 += 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'>-	height = week_view-&gt;main_canvas-&gt;allocation.height + 1;</div><div class='del'>-	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 += 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'>-</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'>-	/* FIXME: free current events? */</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, 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'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_time (&amp;date, start_time);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;display_month) {</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 Monday at or before the start of 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'>-		day_offset += g_date_weekday (&amp;base_date) - 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* Find the 1st Monday at or before the given day. */</div><div class='del'>-		day_offset = g_date_weekday (&amp;date) - 1;</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 (start_time, -day_offset);</div><div class='del'>-		start_time = time_day_begin (start_time);</div><div class='del'>-		e_week_view_recalc_day_starts (week_view, start_time);</div><div class='del'>-		e_week_view_reload_events (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 (start_time, 1))</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'>-		g_date_clear (&amp;end_date, 1);</div><div class='del'>-		g_date_set_time (&amp;end_date, end_time - 60);</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;display_month ? E_WEEK_VIEW_MAX_WEEKS * 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'>-</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'>-/* 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;display_month ? E_WEEK_VIEW_MAX_WEEKS * 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'>-		/* FIXME: There is a bug in time_add_day(). */</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("Day:%i - %s\n", day, ctime (&amp;tmp_time));</div><div class='del'>-#endif</div><div class='del'>-		tmp_time = time_add_day (tmp_time, 1);</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_display_month	(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;display_month;</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_display_month	(EWeekView	*week_view,</div><div class='del'>-				 gboolean	 display_month)</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;display_month == display_month)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;display_month = display_month;</div><div class='del'>-</div><div class='del'>-	if (display_month) {</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'>-	/* FIXME: Need to change start date and adjustment value? */</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_day_starts (week_view, week_view-&gt;day_starts[0]);</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-	e_week_view_reload_events (week_view);</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'>-	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;display_month)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Need to update layout. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This reloads all calendar events. */</div><div class='del'>-void</div><div class='del'>-e_week_view_update_all_events	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	e_week_view_reload_events (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is called when one event has been added or updated. */</div><div class='del'>-void</div><div class='del'>-e_week_view_update_event		(EWeekView	*week_view,</div><div class='del'>-					 const gchar	*uid)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num, num_days;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	CalClientGetStatus status;</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 0</div><div class='del'>-	g_print ("In e_week_view_update_event\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If we don't have a calendar or valid date set yet, just return. */</div><div class='del'>-	if (!week_view-&gt;calendar</div><div class='del'>-	    || !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;calendar-&gt;client, uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Do nothing. */</div><div class='del'>-		break;</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_warning ("syntax error uid=%s\n", uid);</div><div class='del'>-		return;</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		g_warning ("obj not found uid=%s\n", uid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We only care about events. */</div><div class='del'>-	if (ico &amp;&amp; ico-&gt;type != ICAL_EVENT) {</div><div class='del'>-		ical_object_unref (ico);</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 (ical_object_compare_dates (event-&gt;ico, ico)) {</div><div class='del'>-			e_week_view_foreach_event_with_uid (week_view, uid, e_week_view_update_event_cb, ico);</div><div class='del'>-			ical_object_unref (ico);</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'>-		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;display_month ? E_WEEK_VIEW_MAX_WEEKS * 7 : 7;</div><div class='del'>-	ical_object_generate_events (ico,</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,</div><div class='del'>-				     week_view);</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-</div><div class='del'>-	e_week_view_check_layout (week_view);</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'>-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'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = 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'>-	event-&gt;ico = ico;</div><div class='del'>-	ical_object_ref (ico);</div><div class='del'>-</div><div class='del'>-	/* If we are editing an event which we have just created, we will get</div><div class='del'>-	   an update_event callback from the server. But we need to ignore it</div><div class='del'>-	   or we will lose the text the user has already typed in. */</div><div class='del'>-	if (week_view-&gt;editing_new_event</div><div class='del'>-	    &amp;&amp; week_view-&gt;editing_event_num == event_num) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</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'>-			text = event-&gt;ico-&gt;summary;</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'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		if (event-&gt;ico-&gt;uid</div><div class='del'>-		    &amp;&amp; !strcmp (uid, event-&gt;ico-&gt;uid)) {</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'>-/* This removes all the events associated with the given uid. Note that for</div><div class='del'>-   recurring events there may be more than one. If any events are found and</div><div class='del'>-   removed we need to layout the events again. */</div><div class='del'>-void</div><div class='del'>-e_week_view_remove_event	(EWeekView	*week_view,</div><div class='del'>-				 const gchar	*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'>-	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'>-	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'>-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'>-	ical_object_unref (event-&gt;ico);</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 week, day_of_week, row;</div><div class='del'>-</div><div class='del'>-	*day_x = *day_y = *day_w = *day_h = 0;</div><div class='del'>-	g_return_if_fail (day &gt;= 0);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;display_month) {</div><div class='del'>-		g_return_if_fail (day &lt; E_WEEK_VIEW_MAX_WEEKS * 7);</div><div class='del'>-</div><div class='del'>-		week = day / 7;</div><div class='del'>-		day_of_week = day % 7;</div><div class='del'>-		if (week_view-&gt;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_view-&gt;row_offsets[week * 2];</div><div class='del'>-				*day_h = week_view-&gt;row_heights[week * 2];</div><div class='del'>-			} else {</div><div class='del'>-				*day_y = week_view-&gt;row_offsets[week * 2 + 1];</div><div class='del'>-				*day_h = week_view-&gt;row_heights[week * 2 + 1];</div><div class='del'>-			}</div><div class='del'>-			/* Both Saturday and Sunday are in the 6th column. */</div><div class='del'>-			*day_x = week_view-&gt;col_offsets[5];</div><div class='del'>-			*day_w = week_view-&gt;col_widths[5];</div><div class='del'>-		} else {</div><div class='del'>-			*day_y = week_view-&gt;row_offsets[week * 2];</div><div class='del'>-			*day_h = week_view-&gt;row_heights[week * 2]</div><div class='del'>-				+ week_view-&gt;row_heights[week * 2 + 1];</div><div class='del'>-			*day_x = week_view-&gt;col_offsets[day_of_week];</div><div class='del'>-			*day_w = week_view-&gt;col_widths[day_of_week];</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'>-		/* The week view has Mon, Tue &amp; Wed down the left column and</div><div class='del'>-		   Thu, Fri &amp; Sat/Sun down the right. */</div><div class='del'>-		if (day &lt; 3) {</div><div class='del'>-			*day_x = week_view-&gt;col_offsets[0];</div><div class='del'>-			*day_w = week_view-&gt;col_widths[0];</div><div class='del'>-		} else {</div><div class='del'>-			*day_x = week_view-&gt;col_offsets[1];</div><div class='del'>-			*day_w = week_view-&gt;col_widths[1];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (day &lt; 5) {</div><div class='del'>-			row = (day % 3) * 2;</div><div class='del'>-			*day_y = week_view-&gt;row_offsets[row];</div><div class='del'>-			*day_h = week_view-&gt;row_heights[row]</div><div class='del'>-				+ week_view-&gt;row_heights[row + 1];</div><div class='del'>-		} else {</div><div class='del'>-			/* Saturday &amp; Sunday. */</div><div class='del'>-			*day_y = week_view-&gt;row_offsets[day - 1];</div><div class='del'>-			*day_h = week_view-&gt;row_heights[day - 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 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'>-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 end_day_of_week, 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 (span-&gt;row &gt;= week_view-&gt;rows_per_cell)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	end_day_of_week = (span-&gt;start_day + span-&gt;num_days - 1) % 7;</div><div class='del'>-	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;= week_view-&gt;rows_per_compressed_cell) {</div><div class='del'>-		if (week_view-&gt;display_month) {</div><div class='del'>-			if (week_view-&gt;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 (num_days == 1) {</div><div class='del'>-						return FALSE;</div><div class='del'>-					} else {</div><div class='del'>-						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'>-	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;</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 - start_x + end_w;</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'>-#endif</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'>-	/* 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'>-	/* Start the selection drag. */</div><div class='del'>-	if (event-&gt;button == 1) {</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'>-		gnome_calendar_set_selected_time_range (week_view-&gt;calendar,</div><div class='del'>-							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'>-</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;display_month) {</div><div class='del'>-		week = grid_y / 2;</div><div class='del'>-		if (week_view-&gt;compress_weekend &amp;&amp; grid_x == 5</div><div class='del'>-		    &amp;&amp; grid_y % 2 == 1)</div><div class='del'>-			day = 6;</div><div class='del'>-		else</div><div class='del'>-			day = grid_x;</div><div class='del'>-	} else {</div><div class='del'>-		week = 0;</div><div class='del'>-		if (grid_x == 0)</div><div class='del'>-			day = grid_y / 2;</div><div class='del'>-		else if (grid_y == 5)</div><div class='del'>-			day = 6;</div><div class='del'>-		else</div><div class='del'>-			day = grid_y / 2 + 3;</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_reload_events (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gint num_days;</div><div class='del'>-</div><div class='del'>-	e_week_view_free_events (week_view);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;calendar</div><div class='del'>-	    &amp;&amp; g_date_valid (&amp;week_view-&gt;first_day_shown)) {</div><div class='del'>-		num_days = week_view-&gt;display_month</div><div class='del'>-			? E_WEEK_VIEW_MAX_WEEKS * 7 : 7;</div><div class='del'>-		calendar_iterate (week_view-&gt;calendar,</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,</div><div class='del'>-				  week_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_week_view_check_layout (week_view);</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'>-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;</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'>-		ical_object_unref (event-&gt;ico);</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'>-</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 int</div><div class='del'>-e_week_view_add_event (iCalObject *ico,</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 tm start_tm, end_tm;</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;display_month ? E_WEEK_VIEW_MAX_WEEKS * 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_tm = *(localtime (&amp;start));</div><div class='del'>-	end_tm = *(localtime (&amp;end));</div><div class='del'>-</div><div class='del'>-	event.ico = ico;</div><div class='del'>-	ical_object_ref (event.ico);</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_tm.tm_hour * 60 + start_tm.tm_min;</div><div class='del'>-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min;</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 (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'>-	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'>-		e_week_view_layout_events (week_view);</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_layout_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 num_days, day, event_num, span_num;</div><div class='del'>-	guint8 *grid;</div><div class='del'>-	GArray *spans, *old_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 = week_view-&gt;display_month ? E_WEEK_VIEW_MAX_WEEKS * 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'>-	/* 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; 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'>-		e_week_view_layout_event (week_view, event, grid, spans);</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'>-	/* Replace the spans array. */</div><div class='del'>-	old_spans = week_view-&gt;spans;</div><div class='del'>-	week_view-&gt;spans = spans;</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'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_layout_event (EWeekView	   *week_view,</div><div class='del'>-			  EWeekViewEvent   *event,</div><div class='del'>-			  guint8	   *grid,</div><div class='del'>-			  GArray	   *spans)</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, max_day;</div><div class='del'>-	EWeekViewEventSpan span, *old_span;</div><div class='del'>-</div><div class='del'>-	start_day = e_week_view_find_day (week_view, event-&gt;start, FALSE);</div><div class='del'>-	end_day = e_week_view_find_day (week_view, event-&gt;end, TRUE);</div><div class='del'>-	max_day = week_view-&gt;display_month ? E_WEEK_VIEW_MAX_WEEKS * 7 - 1</div><div class='del'>-		: 7 - 1;</div><div class='del'>-	start_day = CLAMP (start_day, 0, max_day);</div><div class='del'>-	end_day = CLAMP (end_day, 0, max_day);</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 (week_view,</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'>-				week_view-&gt;rows_per_day[day] = MAX (week_view-&gt;rows_per_day[day], 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 (week_view-&gt;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'>-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'>-static 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;display_month ? E_WEEK_VIEW_MAX_WEEKS * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt; num_days; day++) {</div><div class='del'>-</div><div class='del'>-		is_weekend = (day % 7 &gt;= 5) ? TRUE : FALSE;</div><div class='del'>-		if (!is_weekend || (week_view-&gt;display_month</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'>-	iCalObject *ico;</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'>-	ico = event-&gt;ico;</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 (!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'>-	num_icons = 0;</div><div class='del'>-	if (show_icons) {</div><div class='del'>-		if (ico-&gt;dalarm.enabled || ico-&gt;malarm.enabled</div><div class='del'>-		    || ico-&gt;palarm.enabled || ico-&gt;aalarm.enabled)</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (ico-&gt;recur)</div><div class='del'>-			num_icons++;</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'>-		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", ico-&gt;summary ? ico-&gt;summary : "",</div><div class='del'>-					       "use_ellipsis", TRUE,</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'>-	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'>-	/* 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;</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'>-		text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD + icons_width;</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'>-			text_x += time_width * 2 + week_view-&gt;space_width</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TIME_R_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'>-			text_x += time_width + E_WEEK_VIEW_EVENT_TIME_R_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'>-		text_w = span_x + span_w - E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-			- 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'>-			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_TEXT_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_TEXT_X_PAD - text_x;</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 (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'>-				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'>-			/* Add on the width of the icons and find the default</div><div class='del'>-			   position. */</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_TEXT_X_PAD;</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_R_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'>-			/* 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_TEXT_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_R_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'>-	text_w = MAX (text_w, 0);</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,</div><div class='del'>-				    text_x, text_y);</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 (EWeekView *week_view,</div><div class='del'>-		      time_t time_to_find,</div><div class='del'>-		      gboolean include_midnight_in_prev_day)</div><div class='del'>-{</div><div class='del'>-	gint num_days, day;</div><div class='del'>-	time_t *day_starts;</div><div class='del'>-</div><div class='del'>-	num_days = week_view-&gt;display_month ? E_WEEK_VIEW_MAX_WEEKS * 7 : 7;</div><div class='del'>-	day_starts = week_view-&gt;day_starts;</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[num_days])</div><div class='del'>-		return num_days;</div><div class='del'>-</div><div class='del'>-	for (day = 1; day &lt;= num_days; 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 num_days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This returns the last day in the same span as the given day. A span is all</div><div class='del'>-   the days which are displayed next to each other from left to right. </div><div class='del'>-   In the week view all spans are only 1 day, since Tuesday is below Monday</div><div class='del'>-   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 Monday to Saturday of each</div><div class='del'>-   week is a span, and the Sundays are separate spans. */</div><div class='del'>-static gint</div><div class='del'>-e_week_view_find_span_end (EWeekView *week_view,</div><div class='del'>-			   gint day)</div><div class='del'>-{</div><div class='del'>-	gint week, day_of_week, end_day;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;display_month) {</div><div class='del'>-		week = day / 7;</div><div class='del'>-		day_of_week = day % 7;</div><div class='del'>-		if (week_view-&gt;compress_weekend &amp;&amp; day_of_week &lt;= 5)</div><div class='del'>-			end_day = 5;</div><div class='del'>-		else</div><div class='del'>-			end_day = 6;</div><div class='del'>-		return week * 7 + end_day;</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'>-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 tm tm;</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'>-	g_date_to_struct_tm (&amp;date, &amp;tm);</div><div class='del'>-	lower = mktime (&amp;tm);</div><div class='del'>-	lower = time_day_begin (lower);</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_day_starts (week_view, lower);</div><div class='del'>-	e_week_view_reload_events (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'>-		gnome_calendar_set_selected_time_range (week_view-&gt;calendar,</div><div class='del'>-							start, end);</div><div class='del'>-	}</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'>-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'>-	e_canvas_item_grab_focus (span-&gt;text_item);</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 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'>-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'>-static gboolean</div><div class='del'>-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'>-{</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 (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 (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'>-		}</div><div class='del'>-		break;</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 (event-&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*) event,</div><div class='del'>-						     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'>-			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 (event) {</div><div class='del'>-				week_view-&gt;drag_event_x = event-&gt;button.x;</div><div class='del'>-				week_view-&gt;drag_event_y = event-&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. */</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 (event-&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'>-</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'>-</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'>-	week_view-&gt;editing_new_event = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Check that the event is still valid. */</div><div class='del'>-	if (!event-&gt;ico-&gt;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'>-</div><div class='del'>-	/* Only update the summary if necessary. */</div><div class='del'>-	if (text &amp;&amp; event-&gt;ico-&gt;summary</div><div class='del'>-	    &amp;&amp; !strcmp (text, event-&gt;ico-&gt;summary)) {</div><div class='del'>-		g_free (text);</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'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event-&gt;ico-&gt;summary)</div><div class='del'>-		g_free (event-&gt;ico-&gt;summary);</div><div class='del'>-</div><div class='del'>-	event-&gt;ico-&gt;summary = text;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;calendar-&gt;client, event-&gt;ico))</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'>-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'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		if (event-&gt;ico-&gt;uid &amp;&amp; !strcmp (uid, event-&gt;ico-&gt;uid)) {</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'>-	iCalObject *ico;</div><div class='del'>-	gint event_num;</div><div class='del'>-	gchar *initial_text;</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 &lt; 0x20)</div><div class='del'>-		   || (event-&gt;keyval &gt; 0xFF)</div><div class='del'>-		   || (event-&gt;length == 0)</div><div class='del'>-		   || (event-&gt;state &amp; (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		initial_text = event-&gt;string;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add a new event covering the selected range.</div><div class='del'>-	   Note that user_name is a global variable. */</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;new = 1;</div><div class='del'>-	ico-&gt;created = time (NULL);</div><div class='del'>-	ico-&gt;last_mod = ico-&gt;created;</div><div class='del'>-	ico-&gt;dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-	ico-&gt;dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-</div><div class='del'>-	/* We add the event locally and start editing it. When we get the</div><div class='del'>-	   "update_event" callback from the server, we basically ignore it.</div><div class='del'>-	   If we were to wait for the "update_event" callback it wouldn't be</div><div class='del'>-	   as responsive and we may lose a few keystrokes. */ </div><div class='del'>-	e_week_view_add_event (ico, ico-&gt;dtstart, ico-&gt;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'>-	if (e_week_view_find_event_from_uid (week_view, ico-&gt;uid,</div><div class='del'>-					     &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'>-		week_view-&gt;editing_new_event = TRUE;</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 (!cal_client_update_object (week_view-&gt;calendar-&gt;client, ico))</div><div class='del'>-		g_message ("e_week_view_key_press(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	ical_object_unref (ico);</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_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, not_being_edited, num_items, i;</div><div class='del'>-	struct menu_item *context_menu;</div><div class='del'>-</div><div class='del'>-	static struct menu_item items[] = {</div><div class='del'>-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static struct menu_item child_items[] = {</div><div class='del'>-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },</div><div class='del'>-		{ N_("Delete this appointment"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },</div><div class='del'>-		{ NULL, NULL, NULL, TRUE },</div><div class='del'>-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static struct menu_item recur_child_items[] = {</div><div class='del'>-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },</div><div class='del'>-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_week_view_on_unrecur_appointment, NULL, TRUE },</div><div class='del'>-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_week_view_on_delete_occurrence, NULL, TRUE },</div><div class='del'>-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },</div><div class='del'>-		{ NULL, NULL, NULL, TRUE },</div><div class='del'>-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }</div><div class='del'>-	};</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'>-	if (event_num == -1) {</div><div class='del'>-		num_items = 1;</div><div class='del'>-		context_menu = &amp;items[0];</div><div class='del'>-		context_menu[0].sensitive = have_selection;</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events,</div><div class='del'>-					EWeekViewEvent, event_num);</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'>-		not_being_edited = TRUE;</div><div class='del'>-</div><div class='del'>-		if (event-&gt;ico-&gt;recur) {</div><div class='del'>-			num_items = 6;</div><div class='del'>-			context_menu = &amp;recur_child_items[0];</div><div class='del'>-			context_menu[0].sensitive = not_being_edited;</div><div class='del'>-			context_menu[1].sensitive = not_being_edited;</div><div class='del'>-			context_menu[2].sensitive = not_being_edited;</div><div class='del'>-			context_menu[3].sensitive = not_being_edited;</div><div class='del'>-			context_menu[5].sensitive = have_selection;</div><div class='del'>-		} else {</div><div class='del'>-			num_items = 4;</div><div class='del'>-			context_menu = &amp;child_items[0];</div><div class='del'>-			context_menu[0].sensitive = not_being_edited;</div><div class='del'>-			context_menu[1].sensitive = not_being_edited;</div><div class='del'>-			context_menu[3].sensitive = have_selection;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_items; i++)</div><div class='del'>-		context_menu[i].data = week_view;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;popup_event_num = event_num;</div><div class='del'>-	popup_menu (context_menu, num_items, bevent);</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_new_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;new = 1;</div><div class='del'>-	ico-&gt;dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-	ico-&gt;dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (week_view-&gt;calendar, ico);</div><div class='del'>-	ical_object_unref (ico);</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_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'>-	gnome_calendar_edit_object (week_view-&gt;calendar, event-&gt;ico);</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_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'>-	iCalObject *ico;</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 iCalObject, or we won't know it has changed</div><div class='del'>-	   when we get the "update_event" callback. */</div><div class='del'>-	ico = ical_object_duplicate (event-&gt;ico);</div><div class='del'>-</div><div class='del'>-	ical_object_add_exdate (ico, event-&gt;start);</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;calendar-&gt;client, ico))</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'>-	ical_object_unref (ico);</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'>-	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 (!cal_client_remove_object (week_view-&gt;calendar-&gt;client, event-&gt;ico-&gt;uid))</div><div class='del'>-		g_message ("e_week_view_on_delete_appointment(): Could not remove the 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_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'>-	iCalObject *ico, *new_ico;</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'>-	ico = ical_object_duplicate (event-&gt;ico);</div><div class='del'>-	ical_object_add_exdate (ico, event-&gt;start);</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_ico = ical_object_duplicate (event-&gt;ico);</div><div class='del'>-	g_free (new_ico-&gt;uid);</div><div class='del'>-	new_ico-&gt;uid = ical_gen_uid ();</div><div class='del'>-	ical_object_reset_recurrence (new_ico);</div><div class='del'>-	new_ico-&gt;dtstart = event-&gt;start;</div><div class='del'>-	new_ico-&gt;dtend   = event-&gt;end;</div><div class='del'>-	</div><div class='del'>-	/* Now update both iCalObjects. 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;calendar-&gt;client, ico))</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'>-	ical_object_unref (ico);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;calendar-&gt;client, new_ico))</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'>-	ical_object_unref (new_ico);</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'>-				gnome_calendar_dayjump (week_view-&gt;calendar,</div><div class='del'>-							week_view-&gt;day_starts[day]);</div><div class='del'>-				/* A quick hack to make the 'Day' toolbar</div><div class='del'>-				   button active. */</div><div class='del'>-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (week_view-&gt;calendar-&gt;view_toolbar_buttons[0]), TRUE);</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='head'>diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h<br/>deleted file mode 100644<br/>index dbb61a58b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/e-week-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,380 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Helix Code, 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 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'>-#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'>-</div><div class='del'>-#include "gnome-cal.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'>-#define E_WEEK_VIEW_MAX_WEEKS		5</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_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		0</div><div class='del'>-#define E_WEEK_VIEW_ICON_Y_PAD		0</div><div class='del'>-</div><div class='del'>-/* The space on the left &amp; right of the event. (The triangle to indicate the</div><div class='del'>-   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		3</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 the event. */</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 each side of the event text. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_TEXT_X_PAD	4</div><div class='del'>-#define E_WEEK_VIEW_EVENT_TEXT_Y_PAD	1</div><div class='del'>-</div><div class='del'>-/* The space on the right of the time string, if it is shown. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_TIME_R_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'>-/* 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'>-	</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'>-	iCalObject *ico;</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'>-	guint num_spans;</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'>-	/* 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'>-	/* 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 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 1 week or 1 month. */</div><div class='del'>-	gboolean display_month;</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'>-	/* 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. Note that the</div><div class='del'>-	   offsets arrays have one more element than the widths/heights arrays</div><div class='del'>-	   since they also contain the 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[10];</div><div class='del'>-	gint row_offsets[11];</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'>-</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'>-	/* This is TRUE if we are editing an event which we have just created.</div><div class='del'>-	   We ignore the "update_event" callback which we will get from the</div><div class='del'>-	   server when the event is added. */</div><div class='del'>-	gboolean editing_new_event;</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'>-</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'>-</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'>-</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'>-/* 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	   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'>-/* Returns the selected time range. */</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'>-</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_display_month	(EWeekView	*week_view);</div><div class='del'>-void       e_week_view_set_display_month	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 display_month);</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'>-/* This reloads all calendar events. */</div><div class='del'>-void       e_week_view_update_all_events	(EWeekView	*week_view);</div><div class='del'>-</div><div class='del'>-/* This is called when one event has been added or updated. */</div><div class='del'>-void       e_week_view_update_event		(EWeekView	*week_view,</div><div class='del'>-						 const gchar	*uid);</div><div class='del'>-</div><div class='del'>-/* This removes all the events associated with the given uid. Note that for</div><div class='del'>-   recurring events there may be more than one. If any events are found and</div><div class='del'>-   removed we need to layout the events again. */</div><div class='del'>-void	   e_week_view_remove_event		(EWeekView	*week_view,</div><div class='del'>-						 const gchar	*uid);</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_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'>-#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/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade<br/>deleted file mode 100644<br/>index 7573a94869..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor-dialog.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/event-editor-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2001 +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-editor-dialog&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;event-editor-dialog&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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;event-editor-dialog.glade.h&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;GnomeApp&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;event-editor-dialog&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;event-editor-dialog&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;dock2&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;dialog-contents&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;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;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;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;table5&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;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;general-owner&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;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;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;label41&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;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;focus_target&gt;general-summary&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;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;label13&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Owner:&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;focus_target&gt;general-owner&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'>-	&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;frame4&lt;/name&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;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;table3&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;label15&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.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;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label16&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.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;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;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;start-time&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;make_date_edit_with_time&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;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;end-time&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;make_date_edit_with_time&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;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;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;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'>-	  &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;frame6&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Alarms&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;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;rows&gt;4&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;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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-display-amount&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;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;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;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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-audio-amount&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;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;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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-program-amount&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;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;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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-mail-amount&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;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;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;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;alarm-display-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;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;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-audio-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;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;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;alarm-program-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;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;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;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-mail-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;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;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;alarm-mail-mail-to&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;5&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;GnomeFileEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-program-run-program&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;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;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;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;alarm-program-run-program-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'>-</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;alarm-display&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Display&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;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;alarm-audio&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Audio&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;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;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-program&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Program&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;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;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alarm-mail&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_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;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;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Mail _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;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;focus_target&gt;alarm-mail-mail-to&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;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;label17&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&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='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;alarm-program-run-program-entry&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;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'>-</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;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;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;hbox6&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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;classification-radio&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;&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;&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Confidential&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'>-      &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;label11&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;vbox3&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;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;frame8&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;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;vbox4&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'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='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;recurrence-rule-none&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;None&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;recurrence_rule_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;recurrence-rule-daily&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Daily&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_rule_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;recurrence-rule-weekly&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Weekly&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_rule_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;recurrence-rule-monthly&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Monthly&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_rule_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;recurrence-rule-yearly&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Yearly&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_rule_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'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVSeparator&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vseparator1&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;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;GtkNotebook&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;recurrence-rule-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;GtkTable&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;table6&lt;/name&gt;</div><div class='del'>-		&lt;rows&gt;3&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;0&lt;/column_spacing&gt;</div><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;label23&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;label23&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;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;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;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox7&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;GtkHBox&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;hbox13&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;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label31&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.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;recurrence-rule-daily-days&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;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;label32&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;day(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.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;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;label24&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;label24&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;2&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;hbox14&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;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label33&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.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;recurrence-rule-weekly-weeks&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;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;label34&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;week(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.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;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;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;recurrence-rule-weekly-mon&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;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;recurrence-rule-weekly-tue&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Tue&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;recurrence-rule-weekly-wed&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;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;recurrence-rule-weekly-thu&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Thu&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;recurrence-rule-weekly-fri&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;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;recurrence-rule-weekly-sat&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;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;recurrence-rule-weekly-sun&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Sun&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;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;label25&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;label25&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;table8&lt;/name&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;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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-rule-monthly-on-day&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;Recur on the&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;recurrence_rule_monthly_group&lt;/group&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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-rule-monthly-weekday&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;Recur on the&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_rule_monthly_group&lt;/group&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;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label35&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;th day of the month&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;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;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-rule-monthly-week&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;items&gt;1st</div><div class='del'>-2nd</div><div class='del'>-3rd</div><div class='del'>-4th</div><div class='del'>-5th</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;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;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;recurrence-rule-monthly-weekpos&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;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;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;hbox19&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;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;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label36&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.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;recurrence-rule-monthly-every-n-months&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;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;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;label37&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;month(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.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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-rule-monthly-day-nth&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;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;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;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'>-</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;vbox11&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;GtkHBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;hbox20&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;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label38&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.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;recurrence-rule-yearly-every-n-years&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;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;label39&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;year(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.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;label27&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;label27&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;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox8&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;GtkFrame&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;frame9&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Ending date&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;vbox5&lt;/name&gt;</div><div class='del'>-	      &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	      &lt;homogeneous&gt;True&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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;recurrence-ending-date-repeat-forever&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Repeat forever&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_ending_date&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;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;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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-ending-date-end-on&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;End on &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_ending_date&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;Custom&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-ending-date-end-on-date&lt;/name&gt;</div><div class='del'>-		  &lt;width&gt;100&lt;/width&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;Sat, 13 May 2000 18:02:55 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;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hbox10&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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-ending-date-end-after&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;End 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;group&gt;recurrence_ending_date&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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-ending-date-end-after-count&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;child&gt;</div><div class='del'>-		    &lt;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;label28&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;occurrence(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.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;GtkFrame&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;frame10&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;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;4&lt;/spacing&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;recurrence-exceptions-date&lt;/name&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 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;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;hbox21&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;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox13&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;recurrence-exceptions-add&lt;/name&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;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='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;recurrence-exceptions-change&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Change&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;recurrence-exceptions-delete&lt;/name&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;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='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;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;recurrence-exceptions-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_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;label40&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;/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;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;label12&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Recurrence&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;appbar2&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/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h<br/>deleted file mode 100644<br/>index c789432d31..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor-dialog.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/event-editor-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("event-editor-dialog");</div><div class='del'>-gchar *s = N_("_Summary:");</div><div class='del'>-gchar *s = N_("_Owner:");</div><div class='del'>-gchar *s = N_("Time");</div><div class='del'>-gchar *s = N_("Start time:");</div><div class='del'>-gchar *s = N_("End time:");</div><div class='del'>-gchar *s = N_("A_ll day event");</div><div class='del'>-gchar *s = N_("Alarms");</div><div class='del'>-gchar *s = N_("Minutes\n"</div><div class='del'>-              "Hours\n"</div><div class='del'>-              "Days\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("Minutes\n"</div><div class='del'>-              "Hours\n"</div><div class='del'>-              "Days\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("Minutes\n"</div><div class='del'>-              "Hours\n"</div><div class='del'>-              "Days\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("Minutes\n"</div><div class='del'>-              "Hours\n"</div><div class='del'>-              "Days\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("_Display");</div><div class='del'>-gchar *s = N_("_Audio");</div><div class='del'>-gchar *s = N_("_Program");</div><div class='del'>-gchar *s = N_("_Mail");</div><div class='del'>-gchar *s = N_("Mail _to:");</div><div class='del'>-gchar *s = N_("_Run program:");</div><div class='del'>-gchar *s = N_("Classification");</div><div class='del'>-gchar *s = N_("Pu_blic");</div><div class='del'>-gchar *s = N_("Pri_vate");</div><div class='del'>-gchar *s = N_("_Confidential");</div><div class='del'>-gchar *s = N_("General");</div><div class='del'>-gchar *s = N_("Recurrence rule");</div><div class='del'>-gchar *s = N_("None");</div><div class='del'>-gchar *s = N_("Daily");</div><div class='del'>-gchar *s = N_("Weekly");</div><div class='del'>-gchar *s = N_("Monthly");</div><div class='del'>-gchar *s = N_("Yearly");</div><div class='del'>-gchar *s = N_("label23");</div><div class='del'>-gchar *s = N_("Every ");</div><div class='del'>-gchar *s = N_("day(s)");</div><div class='del'>-gchar *s = N_("label24");</div><div class='del'>-gchar *s = N_("Every ");</div><div class='del'>-gchar *s = N_("week(s)");</div><div class='del'>-gchar *s = N_("Mon");</div><div class='del'>-gchar *s = N_("Tue");</div><div class='del'>-gchar *s = N_("Wed");</div><div class='del'>-gchar *s = N_("Thu");</div><div class='del'>-gchar *s = N_("Fri");</div><div class='del'>-gchar *s = N_("Sat");</div><div class='del'>-gchar *s = N_("Sun");</div><div class='del'>-gchar *s = N_("label25");</div><div class='del'>-gchar *s = N_("Recur on the");</div><div class='del'>-gchar *s = N_("Recur on the");</div><div class='del'>-gchar *s = N_("th day of the month");</div><div class='del'>-gchar *s = N_("1st\n"</div><div class='del'>-              "2nd\n"</div><div class='del'>-              "3rd\n"</div><div class='del'>-              "4th\n"</div><div class='del'>-              "5th\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("Monday\n"</div><div class='del'>-              "Tuesday\n"</div><div class='del'>-              "Wednesday\n"</div><div class='del'>-              "Thursday\n"</div><div class='del'>-              "Friday\n"</div><div class='del'>-              "Saturday\n"</div><div class='del'>-              "Sunday\n"</div><div class='del'>-              "");</div><div class='del'>-gchar *s = N_("Every");</div><div class='del'>-gchar *s = N_("month(s)");</div><div class='del'>-gchar *s = N_("label26");</div><div class='del'>-gchar *s = N_("Every ");</div><div class='del'>-gchar *s = N_("year(s)");</div><div class='del'>-gchar *s = N_("label27");</div><div class='del'>-gchar *s = N_("Ending date");</div><div class='del'>-gchar *s = N_("Repeat forever");</div><div class='del'>-gchar *s = N_("End on ");</div><div class='del'>-gchar *s = N_("End after");</div><div class='del'>-gchar *s = N_("occurrence(s)");</div><div class='del'>-gchar *s = N_("Exceptions");</div><div class='del'>-gchar *s = N_("Add");</div><div class='del'>-gchar *s = N_("Change");</div><div class='del'>-gchar *s = N_("Delete");</div><div class='del'>-gchar *s = N_("Recurrence");</div><div class='head'>diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c<br/>deleted file mode 100644<br/>index 89e7eb5033..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/event-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1892 +0,0 @@</div><div class='del'>-/* Evolution calendar - Event editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIHandler *uih;</div><div class='del'>-</div><div class='del'>-	/* Calendar object we are editing; this is an internal copy and is not</div><div class='del'>-	 * one of the read-only objects from the parent calendar.</div><div class='del'>-	 */</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-</div><div class='del'>-	GtkWidget *general_owner;</div><div class='del'>-	GtkWidget *general_summary;</div><div class='del'>-</div><div class='del'>-	GtkWidget *start_time;</div><div class='del'>-	GtkWidget *end_time;</div><div class='del'>-	GtkWidget *all_day_event;</div><div class='del'>-</div><div class='del'>-	GtkWidget *alarm_display;</div><div class='del'>-	GtkWidget *alarm_program;</div><div class='del'>-	GtkWidget *alarm_audio;</div><div class='del'>-	GtkWidget *alarm_mail;</div><div class='del'>-	GtkWidget *alarm_display_amount;</div><div class='del'>-	GtkWidget *alarm_display_unit;</div><div class='del'>-	GtkWidget *alarm_audio_amount;</div><div class='del'>-	GtkWidget *alarm_audio_unit;</div><div class='del'>-	GtkWidget *alarm_program_amount;</div><div class='del'>-	GtkWidget *alarm_program_unit;</div><div class='del'>-	GtkWidget *alarm_program_run_program;</div><div class='del'>-	GtkWidget *alarm_program_run_program_entry;</div><div class='del'>-	GtkWidget *alarm_mail_amount;</div><div class='del'>-	GtkWidget *alarm_mail_unit;</div><div class='del'>-	GtkWidget *alarm_mail_mail_to;</div><div class='del'>-</div><div class='del'>-	GtkWidget *classification_radio;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_rule_notebook;</div><div class='del'>-	GtkWidget *recurrence_rule_none;</div><div class='del'>-	GtkWidget *recurrence_rule_daily;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly;</div><div class='del'>-	GtkWidget *recurrence_rule_monthly;</div><div class='del'>-	GtkWidget *recurrence_rule_yearly;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_rule_daily_days;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_weeks;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_sun;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_mon;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_tue;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_wed;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_thu;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_fri;</div><div class='del'>-	GtkWidget *recurrence_rule_weekly_sat;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_rule_monthly_on_day;</div><div class='del'>-	GtkWidget *recurrence_rule_monthly_weekday;</div><div class='del'>-	GtkWidget *recurrence_rule_monthly_day_nth;</div><div class='del'>-	GtkWidget *recurrence_rule_monthly_week;</div><div class='del'>-	GtkWidget *recurrence_rule_monthly_weekpos;</div><div class='del'>-	GtkWidget *recurrence_rule_monthly_every_n_months;</div><div class='del'>-	GtkWidget *recurrence_rule_yearly_every_n_years;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_ending_date_repeat_forever;</div><div class='del'>-	GtkWidget *recurrence_ending_date_end_on;</div><div class='del'>-	GtkWidget *recurrence_ending_date_end_on_date;</div><div class='del'>-	GtkWidget *recurrence_ending_date_end_after;</div><div class='del'>-	GtkWidget *recurrence_ending_date_end_after_count;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_exceptions_date;</div><div class='del'>-	GtkWidget *recurrence_exceptions_list;</div><div class='del'>-	GtkWidget *recurrence_exception_add;</div><div class='del'>-	GtkWidget *recurrence_exception_delete;</div><div class='del'>-	GtkWidget *recurrence_exception_change;</div><div class='del'>-</div><div class='del'>-	GtkWidget *exception_list;</div><div class='del'>-	GtkWidget *exception_date;</div><div class='del'>-} EventEditorPrivate;</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'>-	SAVE_ICAL_OBJECT,</div><div class='del'>-	ICAL_OBJECT_RELEASED,</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 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_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-extern int day_begin, day_end;</div><div class='del'>-extern char *user_name;</div><div class='del'>-extern int am_pm_flag;</div><div class='del'>-extern int week_starts_on_monday;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void append_exception (EventEditor *ee, time_t t);</div><div class='del'>-static void check_all_day (EventEditor *ee);</div><div class='del'>-static void set_all_day (GtkWidget *toggle, EventEditor *ee);</div><div class='del'>-static void alarm_toggle (GtkWidget *toggle, EventEditor *ee);</div><div class='del'>-static void check_dates (GnomeDateEdit *gde, EventEditor *ee);</div><div class='del'>-static void check_times (GnomeDateEdit *gde, EventEditor *ee);</div><div class='del'>-static void recurrence_toggled (GtkWidget *radio, EventEditor *ee);</div><div class='del'>-static void recurrence_exception_added (GtkWidget *widget, EventEditor *ee);</div><div class='del'>-static void recurrence_exception_deleted (GtkWidget *widget, EventEditor *ee);</div><div class='del'>-static void recurrence_exception_changed (GtkWidget *widget, EventEditor *ee);</div><div class='del'>-</div><div class='del'>-static guint event_editor_signals[LAST_SIGNAL];</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'>- * @void:</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 (GTK_TYPE_OBJECT, &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 *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'>-	event_editor_signals[SAVE_ICAL_OBJECT] =</div><div class='del'>-		gtk_signal_new ("save_ical_object",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EventEditorClass, save_ical_object),</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'>-	event_editor_signals[ICAL_OBJECT_RELEASED] =</div><div class='del'>-		gtk_signal_new ("ical_object_released",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EventEditorClass, ical_object_released),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	event_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 (EventEditorClass, 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, event_editor_signals, LAST_SIGNAL);</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'>-/* 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'>-</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'>-	if (priv-&gt;uih) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;uih));</div><div class='del'>-		priv-&gt;uih = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;app) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;app), ee);</div><div class='del'>-		gtk_widget_destroy (priv-&gt;app);</div><div class='del'>-		priv-&gt;app = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ico) {</div><div class='del'>-		/* We do not emit the "ical_object_released" signal here.  If</div><div class='del'>-		 * the user cloased the dialog box, then it has already been</div><div class='del'>-		 * released.  If the application just destroyed the event</div><div class='del'>-		 * editor, then it had better clean up after itself.</div><div class='del'>-		 */</div><div class='del'>-		ical_object_unref (priv-&gt;ico);</div><div class='del'>-		priv-&gt;ico = NULL;</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'>-	ee-&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'>-/* Creates an appropriate title for the event editor dialog */</div><div class='del'>-static char *</div><div class='del'>-make_title_from_ico (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	const char *summary;</div><div class='del'>-</div><div class='del'>-	if (!ico)</div><div class='del'>-		return g_strdup (_("Edit Appointment"));</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;summary)</div><div class='del'>-		summary = ico-&gt;summary;</div><div class='del'>-	else</div><div class='del'>-		summary =  _("No summary");</div><div class='del'>-</div><div class='del'>-	switch (ico-&gt;type) {</div><div class='del'>-	case ICAL_EVENT:</div><div class='del'>-		return g_strdup_printf (_("Appointment - %s"), summary);</div><div class='del'>-</div><div class='del'>-	case ICAL_TODO:</div><div class='del'>-		return g_strdup_printf (_("Task - %s"), summary);</div><div class='del'>-</div><div class='del'>-	case ICAL_JOURNAL:</div><div class='del'>-		return g_strdup_printf (_("Journal entry - %s"), summary);</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("make_title_from_ico(): Cannot handle object of type %d", (int) ico-&gt;type);</div><div class='del'>-		return NULL;</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'>- * For the widgets whose values can be simply set with e-dialog-utils, it does</div><div class='del'>- * that as well.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-get_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'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;app = GW ("event-editor-dialog");</div><div class='del'>-</div><div class='del'>-	priv-&gt;general_owner = GW ("general-owner");</div><div class='del'>-	priv-&gt;general_summary = GW ("general-summary");</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;all_day_event = GW ("all-day-event");</div><div class='del'>-</div><div class='del'>-	priv-&gt;alarm_display = GW ("alarm-display");</div><div class='del'>-	priv-&gt;alarm_program = GW ("alarm-program");</div><div class='del'>-	priv-&gt;alarm_audio = GW ("alarm-audio");</div><div class='del'>-	priv-&gt;alarm_mail = GW ("alarm-mail");</div><div class='del'>-	priv-&gt;alarm_display_amount = GW ("alarm-display-amount");</div><div class='del'>-	priv-&gt;alarm_display_unit = GW ("alarm-display-unit");</div><div class='del'>-	priv-&gt;alarm_audio_amount = GW ("alarm-audio-amount");</div><div class='del'>-	priv-&gt;alarm_audio_unit = GW ("alarm-audio-unit");</div><div class='del'>-	priv-&gt;alarm_program_amount = GW ("alarm-program-amount");</div><div class='del'>-	priv-&gt;alarm_program_unit = GW ("alarm-program-unit");</div><div class='del'>-	priv-&gt;alarm_program_run_program = GW ("alarm-program-run-program");</div><div class='del'>-	priv-&gt;alarm_program_run_program_entry = GW ("alarm-program-run-program-entry");</div><div class='del'>-	priv-&gt;alarm_mail_amount = GW ("alarm-mail-amount");</div><div class='del'>-	priv-&gt;alarm_mail_unit = GW ("alarm-mail-unit");</div><div class='del'>-	priv-&gt;alarm_mail_mail_to = GW ("alarm-mail-mail-to");</div><div class='del'>-</div><div class='del'>-	priv-&gt;classification_radio = GW ("classification-radio");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_rule_notebook = GW ("recurrence-rule-notebook");</div><div class='del'>-	priv-&gt;recurrence_rule_none = GW ("recurrence-rule-none");</div><div class='del'>-	priv-&gt;recurrence_rule_daily = GW ("recurrence-rule-daily");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly = GW ("recurrence-rule-weekly");</div><div class='del'>-	priv-&gt;recurrence_rule_monthly = GW ("recurrence-rule-monthly");</div><div class='del'>-	priv-&gt;recurrence_rule_yearly = GW ("recurrence-rule-yearly");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_rule_daily_days = GW ("recurrence-rule-daily-days");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_weeks = GW ("recurrence-rule-weekly-weeks");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_sun = GW ("recurrence-rule-weekly-sun");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_mon = GW ("recurrence-rule-weekly-mon");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_tue = GW ("recurrence-rule-weekly-tue");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_wed = GW ("recurrence-rule-weekly-wed");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_thu = GW ("recurrence-rule-weekly-thu");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_fri = GW ("recurrence-rule-weekly-fri");</div><div class='del'>-	priv-&gt;recurrence_rule_weekly_sat = GW ("recurrence-rule-weekly-sat");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_rule_monthly_on_day = GW ("recurrence-rule-monthly-on-day");</div><div class='del'>-	priv-&gt;recurrence_rule_monthly_weekday = GW ("recurrence-rule-monthly-weekday");</div><div class='del'>-	priv-&gt;recurrence_rule_monthly_day_nth = GW ("recurrence-rule-monthly-day-nth");</div><div class='del'>-	priv-&gt;recurrence_rule_monthly_week = GW ("recurrence-rule-monthly-week");</div><div class='del'>-	priv-&gt;recurrence_rule_monthly_weekpos = GW ("recurrence-rule-monthly-weekpos");</div><div class='del'>-	priv-&gt;recurrence_rule_monthly_every_n_months = GW ("recurrence-rule-monthly-every-n-months");</div><div class='del'>-	priv-&gt;recurrence_rule_yearly_every_n_years = GW ("recurrence-rule-yearly-every-n-years");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_ending_date_repeat_forever = GW ("recurrence-ending-date-repeat-forever");</div><div class='del'>-	priv-&gt;recurrence_ending_date_end_on = GW ("recurrence-ending-date-end-on");</div><div class='del'>-	priv-&gt;recurrence_ending_date_end_on_date = GW ("recurrence-ending-date-end-on-date");</div><div class='del'>-	priv-&gt;recurrence_ending_date_end_after = GW ("recurrence-ending-date-end-after");</div><div class='del'>-	priv-&gt;recurrence_ending_date_end_after_count = GW ("recurrence-ending-date-end-after-count");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_exceptions_date = GW ("recurrence-exceptions-date");</div><div class='del'>-	priv-&gt;recurrence_exceptions_list = GW ("recurrence-exceptions-list");</div><div class='del'>-	priv-&gt;recurrence_exception_add = GW ("recurrence-exceptions-add");</div><div class='del'>-	priv-&gt;recurrence_exception_delete = GW ("recurrence-exceptions-delete");</div><div class='del'>-	priv-&gt;recurrence_exception_change = GW ("recurrence-exceptions-change");</div><div class='del'>-</div><div class='del'>-	priv-&gt;exception_list = GW ("recurrence-exceptions-list");</div><div class='del'>-	priv-&gt;exception_date = GW ("recurrence-exceptions-date");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;general_owner</div><div class='del'>-		&amp;&amp; priv-&gt;general_summary</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;all_day_event</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_display</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_program</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_audio</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_mail</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_display_amount</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_display_unit</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_audio_amount</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_audio_unit</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_program_amount</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_program_unit</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_program_run_program</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_program_run_program_entry</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_mail_amount</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_mail_unit</div><div class='del'>-		&amp;&amp; priv-&gt;alarm_mail_mail_to</div><div class='del'>-		&amp;&amp; priv-&gt;classification_radio</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_notebook</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_none</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_daily</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_weekly</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_yearly</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_daily_days</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_weekly_weeks</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly_on_day</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly_weekday</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly_day_nth</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly_week</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly_weekpos</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_monthly_every_n_months</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_rule_yearly_every_n_years</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_date_repeat_forever</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_date_end_on</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_date_end_on_date</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_date_end_after</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_date_end_after_count</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exceptions_date</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exceptions_list</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_add</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_delete</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_change</div><div class='del'>-		&amp;&amp; priv-&gt;exception_list</div><div class='del'>-		&amp;&amp; priv-&gt;exception_date);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Classification types; just an enum for mapping them to radio buttons</div><div class='del'>- * (iCalObject uses strings for these).</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	CLASSIFICATION_PUBLIC,</div><div class='del'>-	CLASSIFICATION_PRIVATE,</div><div class='del'>-	CLASSIFICATION_CONFIDENTIAL</div><div class='del'>-} ClassificationType;</div><div class='del'>-</div><div class='del'>-static const int classification_map[] = {</div><div class='del'>-	CLASSIFICATION_PUBLIC,</div><div class='del'>-	CLASSIFICATION_PRIVATE,</div><div class='del'>-	CLASSIFICATION_CONFIDENTIAL,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int alarm_unit_map[] = {</div><div class='del'>-	ALARM_MINUTES,</div><div class='del'>-	ALARM_HOURS,</div><div class='del'>-	ALARM_DAYS,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-alarm_unit_set (GtkWidget *widget, enum AlarmUnit unit)</div><div class='del'>-{</div><div class='del'>-	e_dialog_option_menu_set (widget, unit, alarm_unit_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum AlarmUnit</div><div class='del'>-alarm_unit_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	return e_dialog_option_menu_get (widget, alarm_unit_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Recurrence types for mapping them to radio buttons */</div><div class='del'>-typedef enum {</div><div class='del'>-	RECUR_OPTION_NONE,</div><div class='del'>-	RECUR_OPTION_DAILY,</div><div class='del'>-	RECUR_OPTION_WEEKLY,</div><div class='del'>-	RECUR_OPTION_MONTHLY,</div><div class='del'>-	RECUR_OPTION_YEARLY,</div><div class='del'>-} RecurOptions;</div><div class='del'>-</div><div class='del'>-static const int recur_options_map[] = {</div><div class='del'>-	RECUR_OPTION_NONE,</div><div class='del'>-	RECUR_OPTION_DAILY,</div><div class='del'>-	RECUR_OPTION_WEEKLY,</div><div class='del'>-	RECUR_OPTION_MONTHLY,</div><div class='del'>-	RECUR_OPTION_YEARLY,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static RecurOptions</div><div class='del'>-recur_options_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	return e_dialog_radio_get (widget, recur_options_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const int month_pos_map[] = { 0, 1, 2, 3, 4, -1 };</div><div class='del'>-static const int weekday_map[] = { 0, 1, 2, 3, 4, 5, 6, -1 };</div><div class='del'>-</div><div class='del'>-/* Frees the rows and the row data in the recurrence exceptions GtkCList */</div><div class='del'>-static void</div><div class='del'>-free_exception_clist_data (GtkCList *clist)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; clist-&gt;rows; i++) {</div><div class='del'>-		gpointer data;</div><div class='del'>-</div><div class='del'>-		data = gtk_clist_get_row_data (clist, i);</div><div class='del'>-		g_free (data);</div><div class='del'>-		gtk_clist_set_row_data (clist, i, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_clist_clear (clist);</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 (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'>-	/* Start and end times */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_time), "date_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (check_dates), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_time), "time_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (check_times), ee);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_time), "date_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (check_dates), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_time), "time_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (check_times), ee);</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 (set_all_day), ee);</div><div class='del'>-</div><div class='del'>-	/* Alarms */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;alarm_display), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;alarm_program), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;alarm_audio), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;alarm_mail), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);</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;recurrence_rule_none), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_rule_daily), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_rule_weekly), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_rule_monthly), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_rule_yearly), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);</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;recurrence_exception_add), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_exception_added), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_exception_delete), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_exception_deleted), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_exception_change), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_exception_changed), ee);</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 (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	time_t now;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-</div><div class='del'>-	/* Owner, summary */</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (priv-&gt;general_owner, _("?"));</div><div class='del'>-	e_dialog_editable_set (priv-&gt;general_summary, NULL);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;start_time, now);</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;end_time, now);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-</div><div class='del'>-	check_all_day (ee);</div><div class='del'>-</div><div class='del'>-	/* Alarms */</div><div class='del'>-</div><div class='del'>-	/* FIXMe: these should use configurable defaults */</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_display, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_program, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_audio, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_mail, FALSE);</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_display_amount, 15);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_audio_amount, 15);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_program_amount, 15);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_mail_amount, 15);</div><div class='del'>-</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_display_unit, ALARM_MINUTES);</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_audio_unit, ALARM_MINUTES);</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_program_unit, ALARM_MINUTES);</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_mail_unit, ALARM_MINUTES);</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (priv-&gt;alarm_program_run_program_entry, NULL);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;alarm_mail_mail_to, NULL);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (priv-&gt;classification_radio, CLASSIFICATION_PRIVATE, classification_map);</div><div class='del'>-</div><div class='del'>-	/* Recurrences */</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (priv-&gt;recurrence_rule_none, RECUR_OPTION_NONE, recur_options_map);</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_rule_daily_days, 1);</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_rule_weekly_weeks, 1);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_sun, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_mon, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_tue, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_wed, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_thu, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_fri, FALSE);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_sat, FALSE);</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_rule_monthly_on_day, TRUE);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_rule_monthly_day_nth, 1);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_rule_monthly_every_n_months, 1);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;recurrence_rule_monthly_week, 0, month_pos_map);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;recurrence_rule_monthly_weekpos, 0, weekday_map);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_rule_monthly_every_n_months, 1);</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_rule_yearly_every_n_years, 1);</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;recurrence_ending_date_repeat_forever, TRUE);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_ending_date_end_after_count, 1);</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;recurrence_ending_date_end_on_date,</div><div class='del'>-			       time_add_day (time (NULL), 1));</div><div class='del'>-</div><div class='del'>-	/* Exceptions list */</div><div class='del'>-</div><div class='del'>-	free_exception_clist_data (GTK_CLIST (priv-&gt;recurrence_exceptions_list));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills in the widgets with the proper values */</div><div class='del'>-static void</div><div class='del'>-fill_widgets (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clear_widgets (ee);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ico)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Owner, summary */</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (priv-&gt;general_owner,</div><div class='del'>-			       priv-&gt;ico-&gt;organizer-&gt;addr ?</div><div class='del'>-			       priv-&gt;ico-&gt;organizer-&gt;addr : _("?"));</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (priv-&gt;general_summary, priv-&gt;ico-&gt;summary);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;start_time, priv-&gt;ico-&gt;dtstart);</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;end_time, priv-&gt;ico-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-</div><div class='del'>-	check_all_day (ee);</div><div class='del'>-</div><div class='del'>-	/* Alarms */</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_display, priv-&gt;ico-&gt;dalarm.enabled);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_program, priv-&gt;ico-&gt;palarm.enabled);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_audio, priv-&gt;ico-&gt;aalarm.enabled);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;alarm_mail, priv-&gt;ico-&gt;malarm.enabled);</div><div class='del'>-</div><div class='del'>-	/* Alarm data */</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_display_amount, priv-&gt;ico-&gt;dalarm.count);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_audio_amount, priv-&gt;ico-&gt;aalarm.count);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_program_amount, priv-&gt;ico-&gt;palarm.count);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;alarm_mail_amount, priv-&gt;ico-&gt;malarm.count);</div><div class='del'>-</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_display_unit, priv-&gt;ico-&gt;dalarm.units);</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_audio_unit, priv-&gt;ico-&gt;aalarm.units);</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_program_unit, priv-&gt;ico-&gt;palarm.units);</div><div class='del'>-	alarm_unit_set (priv-&gt;alarm_mail_unit, priv-&gt;ico-&gt;malarm.units);</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (priv-&gt;alarm_program_run_program_entry, priv-&gt;ico-&gt;palarm.data);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;alarm_mail_mail_to, priv-&gt;ico-&gt;malarm.data);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-</div><div class='del'>-	if (strcmp (priv-&gt;ico-&gt;class, "PUBLIC") == 0)</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_radio, CLASSIFICATION_PUBLIC,</div><div class='del'>-				    classification_map);</div><div class='del'>-	else if (strcmp (priv-&gt;ico-&gt;class, "PRIVATE") == 0)</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_radio, CLASSIFICATION_PRIVATE,</div><div class='del'>-				    classification_map);</div><div class='del'>-	else if (strcmp (priv-&gt;ico-&gt;class, "CONFIDENTIAL") == 0)</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_radio, CLASSIFICATION_CONFIDENTIAL,</div><div class='del'>-				    classification_map);</div><div class='del'>-	else {</div><div class='del'>-		/* What do do?  We can't g_assert_not_reached() since it is a</div><div class='del'>-		 * value from an external file.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recurrences */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ico-&gt;recur) {</div><div class='del'>-		switch (priv-&gt;ico-&gt;recur-&gt;type) {</div><div class='del'>-		case RECUR_DAILY:</div><div class='del'>-			e_dialog_radio_set (priv-&gt;recurrence_rule_daily, RECUR_OPTION_DAILY,</div><div class='del'>-					    recur_options_map);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;recurrence_rule_daily_days,</div><div class='del'>-					   priv-&gt;ico-&gt;recur-&gt;interval);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_WEEKLY:</div><div class='del'>-			e_dialog_radio_set (priv-&gt;recurrence_rule_weekly, RECUR_OPTION_WEEKLY,</div><div class='del'>-					    recur_options_map);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;recurrence_rule_weekly_weeks,</div><div class='del'>-					   priv-&gt;ico-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_sun,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 0)) != 0);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_mon,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 1)) != 0);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_tue,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 2)) != 0);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_wed,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 3)) != 0);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_thu,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 4)) != 0);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_fri,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 5)) != 0);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_weekly_sat,</div><div class='del'>-					     (priv-&gt;ico-&gt;recur-&gt;weekday &amp; (1 &lt;&lt; 6)) != 0);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_MONTHLY_BY_DAY:</div><div class='del'>-			e_dialog_radio_set (priv-&gt;recurrence_rule_monthly, RECUR_OPTION_MONTHLY,</div><div class='del'>-					    recur_options_map);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_monthly_on_day, TRUE);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;recurrence_rule_monthly_day_nth,</div><div class='del'>-					   priv-&gt;ico-&gt;recur-&gt;u.month_day);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;recurrence_rule_monthly_every_n_months,</div><div class='del'>-					   priv-&gt;ico-&gt;recur-&gt;interval);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_MONTHLY_BY_POS:</div><div class='del'>-			e_dialog_radio_set (priv-&gt;recurrence_rule_monthly, RECUR_OPTION_MONTHLY,</div><div class='del'>-					    recur_options_map);</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_rule_monthly_weekday, TRUE);</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;recurrence_rule_monthly_week,</div><div class='del'>-						  priv-&gt;ico-&gt;recur-&gt;u.month_pos,</div><div class='del'>-						  month_pos_map);</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;recurrence_rule_monthly_weekpos,</div><div class='del'>-						  priv-&gt;ico-&gt;recur-&gt;weekday,</div><div class='del'>-						  weekday_map);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;recurrence_rule_monthly_every_n_months,</div><div class='del'>-					   priv-&gt;ico-&gt;recur-&gt;interval);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case RECUR_YEARLY_BY_DAY:</div><div class='del'>-		case RECUR_YEARLY_BY_MONTH:</div><div class='del'>-			e_dialog_radio_set (priv-&gt;recurrence_rule_yearly, RECUR_OPTION_YEARLY,</div><div class='del'>-					    recur_options_map);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;recurrence_rule_yearly_every_n_years,</div><div class='del'>-					   priv-&gt;ico-&gt;recur-&gt;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'>-		if (priv-&gt;ico-&gt;recur-&gt;_enddate == 0) {</div><div class='del'>-			if (priv-&gt;ico-&gt;recur-&gt;duration == 0)</div><div class='del'>-				e_dialog_toggle_set (priv-&gt;recurrence_ending_date_repeat_forever,</div><div class='del'>-						     TRUE);</div><div class='del'>-			else {</div><div class='del'>-				e_dialog_toggle_set (priv-&gt;recurrence_ending_date_end_after, TRUE);</div><div class='del'>-				e_dialog_spin_set (priv-&gt;recurrence_ending_date_end_after_count,</div><div class='del'>-						   priv-&gt;ico-&gt;recur-&gt;duration);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			e_dialog_toggle_set (priv-&gt;recurrence_ending_date_end_on, TRUE);</div><div class='del'>-			/* Shorten by one day, as we store end-on date a day ahead */</div><div class='del'>-			/* FIXME is this correct? */</div><div class='del'>-			e_dialog_dateedit_set (priv-&gt;recurrence_ending_date_end_on_date,</div><div class='del'>-					       time_add_day (priv-&gt;ico-&gt;recur-&gt;enddate, -1));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Exceptions list */</div><div class='del'>-</div><div class='del'>-	for (list = priv-&gt;ico-&gt;exdate; list; list = list-&gt;next)</div><div class='del'>-		append_exception (ee, *((time_t *) list-&gt;data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Frees the list of exception dates in an iCalObject */</div><div class='del'>-static void</div><div class='del'>-free_exdate (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	if (!ico-&gt;exdate)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (list = ico-&gt;exdate; list; list = list-&gt;next)</div><div class='del'>-		g_free (list-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_list_free (ico-&gt;exdate);</div><div class='del'>-	ico-&gt;exdate = 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 ClassificationType</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'>-/* Get the values of the widgets in the event editor and put them in the iCalObject */</div><div class='del'>-static void</div><div class='del'>-dialog_to_ical_object (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	gboolean all_day_event;</div><div class='del'>-	int i;</div><div class='del'>-	time_t *t;</div><div class='del'>-	GtkCList *exception_list;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-	ico = priv-&gt;ico;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;summary)</div><div class='del'>-		g_free (ico-&gt;summary);</div><div class='del'>-</div><div class='del'>-	ico-&gt;summary  = e_dialog_editable_get (priv-&gt;general_summary);</div><div class='del'>-</div><div class='del'>-	ico-&gt;dtstart = e_dialog_dateedit_get (priv-&gt;start_time);</div><div class='del'>-	ico-&gt;dtend = e_dialog_dateedit_get (priv-&gt;end_time);</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'>-	ico-&gt;dalarm.enabled = e_dialog_toggle_get (priv-&gt;alarm_display);</div><div class='del'>-	ico-&gt;aalarm.enabled = e_dialog_toggle_get (priv-&gt;alarm_program);</div><div class='del'>-	ico-&gt;palarm.enabled = e_dialog_toggle_get (priv-&gt;alarm_audio);</div><div class='del'>-	ico-&gt;malarm.enabled = e_dialog_toggle_get (priv-&gt;alarm_mail);</div><div class='del'>-</div><div class='del'>-	ico-&gt;dalarm.count = e_dialog_spin_get_int (priv-&gt;alarm_display_amount);</div><div class='del'>-	ico-&gt;aalarm.count = e_dialog_spin_get_int (priv-&gt;alarm_audio_amount);</div><div class='del'>-	ico-&gt;palarm.count = e_dialog_spin_get_int (priv-&gt;alarm_program_amount);</div><div class='del'>-	ico-&gt;malarm.count = e_dialog_spin_get_int (priv-&gt;alarm_mail_amount);</div><div class='del'>-</div><div class='del'>-	ico-&gt;dalarm.units = alarm_unit_get (priv-&gt;alarm_display_unit);</div><div class='del'>-	ico-&gt;aalarm.units = alarm_unit_get (priv-&gt;alarm_audio_unit);</div><div class='del'>-	ico-&gt;palarm.units = alarm_unit_get (priv-&gt;alarm_program_unit);</div><div class='del'>-	ico-&gt;malarm.units = alarm_unit_get (priv-&gt;alarm_mail_unit);</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;palarm.data)</div><div class='del'>-		g_free (ico-&gt;palarm.data);</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;malarm.data)</div><div class='del'>-		g_free (ico-&gt;malarm.data);</div><div class='del'>-</div><div class='del'>-	ico-&gt;palarm.data = e_dialog_editable_get (priv-&gt;alarm_program_run_program_entry);</div><div class='del'>-	ico-&gt;malarm.data = e_dialog_editable_get (priv-&gt;alarm_mail_mail_to);</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;class)</div><div class='del'>-		g_free (ico-&gt;class);</div><div class='del'>-</div><div class='del'>-	switch (classification_get (priv-&gt;classification_radio)) {</div><div class='del'>-	case CLASSIFICATION_PUBLIC:</div><div class='del'>-		ico-&gt;class = g_strdup ("PUBLIC");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CLASSIFICATION_PRIVATE:</div><div class='del'>-		ico-&gt;class = g_strdup ("PRIVATE");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CLASSIFICATION_CONFIDENTIAL:</div><div class='del'>-		ico-&gt;class = g_strdup ("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'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recurrence information */</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;recur) {</div><div class='del'>-		g_free (ico-&gt;recur);</div><div class='del'>-		ico-&gt;recur = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (recur_options_get (priv-&gt;recurrence_rule_none)) {</div><div class='del'>-	case RECUR_OPTION_NONE:</div><div class='del'>-		/* nothing */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_OPTION_DAILY:</div><div class='del'>-		ico-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-		ico-&gt;recur-&gt;type = RECUR_DAILY;</div><div class='del'>-		ico-&gt;recur-&gt;interval = e_dialog_spin_get_int (priv-&gt;recurrence_rule_daily_days);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_OPTION_WEEKLY:</div><div class='del'>-		ico-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-		ico-&gt;recur-&gt;type = RECUR_WEEKLY;</div><div class='del'>-		ico-&gt;recur-&gt;interval = e_dialog_spin_get_int (priv-&gt;recurrence_rule_weekly_weeks);</div><div class='del'>-		ico-&gt;recur-&gt;weekday = 0;</div><div class='del'>-</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_sun))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 0;</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_mon))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 1;</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_tue))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 2;</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_wed))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 3;</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_thu))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 4;</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_fri))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 5;</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_weekly_sat))</div><div class='del'>-			ico-&gt;recur-&gt;weekday |= 1 &lt;&lt; 6;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_OPTION_MONTHLY:</div><div class='del'>-		ico-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_rule_monthly_on_day)) {</div><div class='del'>-				/* by day of in the month (ex: the 5th) */</div><div class='del'>-			ico-&gt;recur-&gt;type = RECUR_MONTHLY_BY_DAY;</div><div class='del'>-			ico-&gt;recur-&gt;u.month_day = e_dialog_spin_get_int (</div><div class='del'>-				priv-&gt;recurrence_rule_monthly_day_nth);</div><div class='del'>-		} else if (e_dialog_toggle_get (priv-&gt;recurrence_rule_monthly_weekday)) {</div><div class='del'>-				/* "recurrence-rule-monthly-weekday" is TRUE */</div><div class='del'>-				/* by position on the calender (ex: 2nd monday) */</div><div class='del'>-			ico-&gt;recur-&gt;type = RECUR_MONTHLY_BY_POS;</div><div class='del'>-			ico-&gt;recur-&gt;u.month_pos = e_dialog_option_menu_get (</div><div class='del'>-				priv-&gt;recurrence_rule_monthly_week,</div><div class='del'>-				month_pos_map);</div><div class='del'>-			ico-&gt;recur-&gt;weekday = e_dialog_option_menu_get (</div><div class='del'>-				priv-&gt;recurrence_rule_monthly_weekpos,</div><div class='del'>-				weekday_map);</div><div class='del'>-</div><div class='del'>-		} else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-		ico-&gt;recur-&gt;interval = e_dialog_spin_get_int (</div><div class='del'>-			priv-&gt;recurrence_rule_monthly_every_n_months);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_OPTION_YEARLY:</div><div class='del'>-		ico-&gt;recur = g_new0 (Recurrence, 1);</div><div class='del'>-		ico-&gt;recur-&gt;type = RECUR_YEARLY_BY_DAY;</div><div class='del'>-		ico-&gt;recur-&gt;interval = e_dialog_spin_get_int (</div><div class='del'>-			priv-&gt;recurrence_rule_yearly_every_n_years);</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'>-	/* recurrence ending date */</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;recur) {</div><div class='del'>-		if (e_dialog_toggle_get (priv-&gt;recurrence_ending_date_repeat_forever)) {</div><div class='del'>-			ico-&gt;recur-&gt;_enddate = 0;</div><div class='del'>-			ico-&gt;recur-&gt;enddate = 0;</div><div class='del'>-			ico-&gt;recur-&gt;duration = 0;</div><div class='del'>-		} else if (e_dialog_toggle_get (priv-&gt;recurrence_ending_date_end_on)) {</div><div class='del'>-			/* Also here, to ensure that the event is used, we add 86400</div><div class='del'>-			 * secs to get get next day, in accordance to the RFC</div><div class='del'>-			 */</div><div class='del'>-			ico-&gt;recur-&gt;_enddate = e_dialog_dateedit_get (</div><div class='del'>-				priv-&gt;recurrence_ending_date_end_on_date) + 86400;</div><div class='del'>-			ico-&gt;recur-&gt;enddate = ico-&gt;recur-&gt;_enddate;</div><div class='del'>-			ico-&gt;recur-&gt;duration = 0;</div><div class='del'>-		} else if (e_dialog_toggle_get (priv-&gt;recurrence_ending_date_end_after)) {</div><div class='del'>-			ico-&gt;recur-&gt;duration = e_dialog_spin_get_int (</div><div class='del'>-				priv-&gt;recurrence_ending_date_end_after_count);</div><div class='del'>-			ical_object_compute_end (ico);</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'>-	/* Get exceptions from clist into ico-&gt;exdate */</div><div class='del'>-</div><div class='del'>-	free_exdate (ico);</div><div class='del'>-	exception_list = GTK_CLIST (priv-&gt;recurrence_exceptions_list);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; exception_list-&gt;rows; i++) {</div><div class='del'>-		t = gtk_clist_get_row_data (exception_list, i);</div><div class='del'>-		ico-&gt;exdate = g_list_prepend (ico-&gt;exdate, t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the "save_ical_object" signal if the event editor is editing an object. */</div><div class='del'>-static void</div><div class='del'>-save_ical_object (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	char *title;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;ico)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dialog_to_ical_object (ee);</div><div class='del'>-</div><div class='del'>-	title = make_title_from_ico (priv-&gt;ico);</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (priv-&gt;app), title);</div><div class='del'>-	g_free (title);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (ee), event_editor_signals[SAVE_ICAL_OBJECT],</div><div class='del'>-			 priv-&gt;ico);</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 (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'>-	g_assert (priv-&gt;app != NULL);</div><div class='del'>-</div><div class='del'>-	free_exception_clist_data (GTK_CLIST (priv-&gt;recurrence_exceptions_list));</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (priv-&gt;app);</div><div class='del'>-	priv-&gt;app = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ico) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ee), event_editor_signals[ICAL_OBJECT_RELEASED],</div><div class='del'>-				 priv-&gt;ico-&gt;uid);</div><div class='del'>-		ical_object_unref (priv-&gt;ico);</div><div class='del'>-		priv-&gt;ico = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (ee), event_editor_signals[EDITOR_CLOSED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-	save_ical_object (ee);</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'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	/* FIXME: need to check for a dirty object */</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-	close_dialog (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Menu bar */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_new_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Appointment"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Meeting Re_quest"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Mail Message"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Contact"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Task"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Task _Request"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Journal Entry"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Note"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_page_setup_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Memo Style"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Define Print _Styles..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_NEW_SUBTREE (file_new_menu),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: S_end"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_ITEM (file_save_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Save Attac_hments..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Delete"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Move to Folder..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Cop_y to Folder..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Page Set_up"), file_page_setup_menu),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print Pre_view"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PRINT_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CLOSE_ITEM (file_close_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo edit_object_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE ("FIXME: what goes here?", NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo edit_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_UNDO_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_REDO_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CUT_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_COPY_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PASTE_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Paste _Special..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_CLEAR_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SELECT_ALL_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Mark as U_nread"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_FIND_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM (NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Object"), edit_object_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_previous_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Fi_rst Item in Folder"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_next_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Last Item in Folder"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_toolbars_menu[] = {</div><div class='del'>-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,</div><div class='del'>-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },</div><div class='del'>-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,</div><div class='del'>-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_menu[] = {</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Pre_vious"), view_previous_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Ne_xt"), view_next_menu),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ca_lendar..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Toolbars"), view_toolbars_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo insert_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _File..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: It_em..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Object..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo format_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Font..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Paragraph..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo tools_forms_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Desi_gn This Form"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: D_esign a Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Publish _Form..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Pu_blish Form As..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Script _Debugger"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo tools_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Spelling..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Chec_k Names"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Address _Book..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Forms"), tools_forms_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo actions_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _New Appointment"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Rec_urrence..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Intive _Attendees..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: C_ancel Invitation..."), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Forward as v_Calendar"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo help_menu[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE ("FIXME: fix Bonobo so it supports help items!", NULL, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo main_menu[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Insert"), insert_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),</div><div class='del'>-	GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),</div><div class='del'>-	GNOMEUIINFO_MENU_HELP_TREE (help_menu),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the menu bar for the event editor */</div><div class='del'>-static void</div><div class='del'>-create_menu (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	BonoboUIHandlerMenuItem *list;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_menubar (priv-&gt;uih);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (main_menu, ee);</div><div class='del'>-	bonobo_ui_handler_menu_add_list (priv-&gt;uih, "/", list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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 (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-	save_ical_object (ee);</div><div class='del'>-	close_dialog (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Toolbar */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo toolbar[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Save and Close"),</div><div class='del'>-				N_("Save the appointment and close the dialog box"),</div><div class='del'>-				tb_save_and_close_cb,</div><div class='del'>-				GNOME_STOCK_PIXMAP_SAVE),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print..."),</div><div class='del'>-			       N_("Print this item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Insert File..."),</div><div class='del'>-			       N_("Insert a file as an attachment"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Recurrence..."),</div><div class='del'>-			       N_("Configure recurrence rules"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Invite Attendees..."),</div><div class='del'>-			       N_("Invite attendees to a meeting"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Delete"),</div><div class='del'>-			       N_("Delete this item"), NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Previous"),</div><div class='del'>-			       N_("Go to the previous item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Next"),</div><div class='del'>-			       N_("Go to the next item"), NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Help"),</div><div class='del'>-				N_("See online help"), NULL, GNOME_STOCK_PIXMAP_HELP),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the toolbar for the event editor */</div><div class='del'>-static void</div><div class='del'>-create_toolbar (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	BonoboUIHandlerToolbarItem *list;</div><div class='del'>-	GnomeDockItem *dock_item;</div><div class='del'>-	GtkWidget *toolbar_child;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_toolbar (priv-&gt;uih, "Toolbar");</div><div class='del'>-</div><div class='del'>-	/* Fetch the toolbar.  What a pain in the ass. */</div><div class='del'>-</div><div class='del'>-	dock_item = gnome_app_get_dock_item_by_name (GNOME_APP (priv-&gt;app), GNOME_APP_TOOLBAR_NAME);</div><div class='del'>-	g_assert (dock_item != NULL);</div><div class='del'>-</div><div class='del'>-	toolbar_child = gnome_dock_item_get_child (dock_item);</div><div class='del'>-	g_assert (toolbar_child != NULL &amp;&amp; GTK_IS_TOOLBAR (toolbar_child));</div><div class='del'>-</div><div class='del'>-	/* Turn off labels as GtkToolbar sucks */</div><div class='del'>-	gtk_toolbar_set_style (GTK_TOOLBAR (toolbar_child), GTK_TOOLBAR_ICONS);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_toolbar_parse_uiinfo_list_with_data (toolbar, ee);</div><div class='del'>-	bonobo_ui_handler_toolbar_add_list (priv-&gt;uih, "/Toolbar", list);</div><div class='del'>-}</div><div class='del'>-</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'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	/* FIXME: need to check for a dirty object */</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-	close_dialog (ee);</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'>- * event_editor_construct:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * </div><div class='del'>- * Constructs an event editor by loading its Glade data.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @ee, or NULL if the widgets could not be</div><div class='del'>- * created.  In the latter case, the event editor will automatically be</div><div class='del'>- * destroyed.</div><div class='del'>- **/</div><div class='del'>-EventEditor *</div><div class='del'>-event_editor_construct (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ee != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EVENT_EDITOR (ee), NULL);</div><div class='del'>-</div><div class='del'>-	priv = ee-&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 "/event-editor-dialog.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("event_editor_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 (ee)) {</div><div class='del'>-		g_message ("event_editor_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'>-	init_widgets (ee);</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-</div><div class='del'>-	priv-&gt;uih = bonobo_ui_handler_new ();</div><div class='del'>-	if (!priv-&gt;uih) {</div><div class='del'>-		g_message ("event_editor_construct(): Could not create the UI handler");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_set_app (priv-&gt;uih, GNOME_APP (priv-&gt;app));</div><div class='del'>-</div><div class='del'>-	create_menu (ee);</div><div class='del'>-	create_toolbar (ee);</div><div class='del'>-</div><div class='del'>-	/* Hook to destruction of the dialog */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;app), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (app_delete_event_cb), ee);</div><div class='del'>-</div><div class='del'>-	/* Show the dialog */</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;app);</div><div class='del'>-</div><div class='del'>-	return ee;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ee));</div><div class='del'>-	return NULL;</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'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (gtk_type_new (TYPE_EVENT_EDITOR));</div><div class='del'>-	return event_editor_construct (EVENT_EDITOR (ee));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_set_ical_object:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * @ico: A calendar object.</div><div class='del'>- * </div><div class='del'>- * Sets the calendar object that an event editor dialog will manipulate.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-event_editor_set_ical_object (EventEditor *ee, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	char *title;</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'>-	if (ico)</div><div class='del'>-		g_return_if_fail (ico-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ico) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ee), event_editor_signals[ICAL_OBJECT_RELEASED],</div><div class='del'>-				 priv-&gt;ico-&gt;uid);</div><div class='del'>-		ical_object_unref (priv-&gt;ico);</div><div class='del'>-		priv-&gt;ico = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ico)</div><div class='del'>-		priv-&gt;ico = ical_object_duplicate (ico);</div><div class='del'>-</div><div class='del'>-	title = make_title_from_ico (priv-&gt;ico);</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (priv-&gt;app), title);</div><div class='del'>-	g_free (title);</div><div class='del'>-</div><div class='del'>-	fill_widgets (ee);</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'>- * event_editor_focus:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * </div><div class='del'>- * Makes sure an event editor is shown, on top of other windows, and focused.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-event_editor_focus (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</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'>-	priv = ee-&gt;priv;</div><div class='del'>-	gtk_widget_show_now (priv-&gt;app);</div><div class='del'>-	raise_and_focus (priv-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-alarm_toggle (GtkWidget *toggle, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GtkWidget *alarm_amount;</div><div class='del'>-	GtkWidget *alarm_unit;</div><div class='del'>-	gboolean active;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	active = GTK_TOGGLE_BUTTON (toggle)-&gt;active;</div><div class='del'>-</div><div class='del'>-	if (toggle == priv-&gt;alarm_display) {</div><div class='del'>-		alarm_amount = priv-&gt;alarm_display_amount;</div><div class='del'>-		alarm_unit = priv-&gt;alarm_display_unit;</div><div class='del'>-	} else if (toggle == priv-&gt;alarm_audio) {</div><div class='del'>-		alarm_amount = priv-&gt;alarm_audio_amount;</div><div class='del'>-		alarm_unit = priv-&gt;alarm_audio_unit;</div><div class='del'>-	} else if (toggle == priv-&gt;alarm_program) {</div><div class='del'>-		alarm_amount = priv-&gt;alarm_program_amount;</div><div class='del'>-		alarm_unit = priv-&gt;alarm_program_unit;</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;alarm_program_run_program, active);</div><div class='del'>-	} else if (toggle == priv-&gt;alarm_mail) {</div><div class='del'>-		alarm_amount = priv-&gt;alarm_mail_amount;</div><div class='del'>-		alarm_unit = priv-&gt;alarm_mail_unit;</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;alarm_mail_mail_to, active);</div><div class='del'>-	} else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (alarm_amount, active);</div><div class='del'>-	gtk_widget_set_sensitive (alarm_unit, active);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Checks if the day range occupies all the day, and if so, check the</div><div class='del'>- * box accordingly</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-check_all_day (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	time_t ev_start, ev_end;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ev_start = e_dialog_dateedit_get (priv-&gt;start_time);</div><div class='del'>-	ev_end = e_dialog_dateedit_get (priv-&gt;end_time);</div><div class='del'>-</div><div class='del'>-	/* all day event checkbox */</div><div class='del'>-	if (get_time_t_hour (ev_start) &lt;= day_begin &amp;&amp;</div><div class='del'>-	    get_time_t_hour (ev_end) &gt;= day_end)</div><div class='del'>-		e_dialog_toggle_set (priv-&gt;all_day_event, TRUE);</div><div class='del'>-	else</div><div class='del'>-		e_dialog_toggle_set (priv-&gt;all_day_event, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Callback: all day event box clicked</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-set_all_day (GtkWidget *toggle, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t start_t;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	start_t = e_dialog_dateedit_get (priv-&gt;start_time);</div><div class='del'>-	tm = *localtime (&amp;start_t);</div><div class='del'>-	tm.tm_hour = day_begin;</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;start_time, mktime (&amp;tm));</div><div class='del'>-</div><div class='del'>-	if (GTK_TOGGLE_BUTTON (toggle)-&gt;active)</div><div class='del'>-		tm.tm_hour = day_end;</div><div class='del'>-	else</div><div class='del'>-		tm.tm_hour++;</div><div class='del'>-</div><div class='del'>-	e_dialog_dateedit_set (priv-&gt;end_time, mktime (&amp;tm));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Callback: checks that the dates are start &lt; end</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-check_dates (GnomeDateEdit *gde, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	struct tm tm_start, tm_end;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	start = e_dialog_dateedit_get (priv-&gt;start_time);</div><div class='del'>-	end = e_dialog_dateedit_get (priv-&gt;end_time);</div><div class='del'>-</div><div class='del'>-	if (start &gt; end) {</div><div class='del'>-		tm_start = *localtime (&amp;start);</div><div class='del'>-		tm_end = *localtime (&amp;end);</div><div class='del'>-</div><div class='del'>-		if (GTK_WIDGET (gde) == priv-&gt;start_time) {</div><div class='del'>-			tm_end.tm_year = tm_start.tm_year;</div><div class='del'>-			tm_end.tm_mon  = tm_start.tm_mon;</div><div class='del'>-			tm_end.tm_mday = tm_start.tm_mday;</div><div class='del'>-</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-			e_dialog_dateedit_set (priv-&gt;end_time, mktime (&amp;tm_end));</div><div class='del'>-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-		} else if (GTK_WIDGET (gde) == priv-&gt;end_time) {</div><div class='del'>-			tm_start.tm_year = tm_end.tm_year;</div><div class='del'>-			tm_start.tm_mon  = tm_end.tm_mon;</div><div class='del'>-			tm_start.tm_mday = tm_end.tm_mday;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-			e_dialog_dateedit_set (priv-&gt;start_time, mktime (&amp;tm_start));</div><div class='del'>-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</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'>- * Callback: checks that start_time &lt; end_time and whether the</div><div class='del'>- * selected hour range spans all of the day</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-check_times (GnomeDateEdit *gde, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	struct tm tm_start, tm_end;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-#if 0</div><div class='del'>-	gdk_pointer_ungrab (GDK_CURRENT_TIME);</div><div class='del'>-	gdk_flush ();</div><div class='del'>-#endif</div><div class='del'>-	start = e_dialog_dateedit_get (priv-&gt;start_time);</div><div class='del'>-	end = e_dialog_dateedit_get (priv-&gt;end_time);</div><div class='del'>-</div><div class='del'>-	if (start &gt;= end) {</div><div class='del'>-		tm_start = *localtime (&amp;start);</div><div class='del'>-		tm_end = *localtime (&amp;end);</div><div class='del'>-</div><div class='del'>-		if (GTK_WIDGET (gde) == priv-&gt;start_time) {</div><div class='del'>-			tm_end.tm_min  = tm_start.tm_min;</div><div class='del'>-			tm_end.tm_sec  = tm_start.tm_sec;</div><div class='del'>-			tm_end.tm_hour = tm_start.tm_hour + 1;</div><div class='del'>-</div><div class='del'>-			if (tm_end.tm_hour &gt;= 24) {</div><div class='del'>-				tm_end.tm_hour = 24; /* mktime() will bump the day */</div><div class='del'>-				tm_end.tm_min = 0;</div><div class='del'>-				tm_end.tm_sec = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-			e_dialog_dateedit_set (priv-&gt;end_time, mktime (&amp;tm_end));</div><div class='del'>-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-		} else if (GTK_WIDGET (gde) == priv-&gt;end_time) {</div><div class='del'>-			tm_start.tm_min  = tm_end.tm_min;</div><div class='del'>-			tm_start.tm_sec  = tm_end.tm_sec;</div><div class='del'>-			tm_start.tm_hour = tm_end.tm_hour - 1;</div><div class='del'>-</div><div class='del'>-			if (tm_start.tm_hour &lt; 0) {</div><div class='del'>-				tm_start.tm_hour = 0;</div><div class='del'>-				tm_start.tm_min = 0;</div><div class='del'>-				tm_start.tm_min = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-			e_dialog_dateedit_set (priv-&gt;start_time, mktime (&amp;tm_start));</div><div class='del'>-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check whether the event spans the whole day */</div><div class='del'>-</div><div class='del'>-	check_all_day (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recurrence_toggled (GtkWidget *radio, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	RecurOptions ro;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_TOGGLE_BUTTON (radio)-&gt;active)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ro = e_dialog_radio_get (radio, recur_options_map);</div><div class='del'>-</div><div class='del'>-	gtk_notebook_set_page (GTK_NOTEBOOK (priv-&gt;recurrence_rule_notebook), (int) ro);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_exception_string (time_t t)</div><div class='del'>-{</div><div class='del'>-	static char buf[256];</div><div class='del'>-</div><div class='del'>-	strftime (buf, sizeof (buf), _("%a %b %d %Y"), localtime (&amp;t));</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-append_exception (EventEditor *ee, time_t t)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	time_t *tt;</div><div class='del'>-	char *c[1];</div><div class='del'>-	int i;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	c[0] = get_exception_string (t);</div><div class='del'>-</div><div class='del'>-	tt = g_new (time_t, 1);</div><div class='del'>-	*tt = t;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;recurrence_exceptions_list);</div><div class='del'>-</div><div class='del'>-	i = gtk_clist_append (clist, c);</div><div class='del'>-	gtk_clist_set_row_data (clist, i, tt);</div><div class='del'>-	gtk_clist_select_row (clist, i, 0);</div><div class='del'>-</div><div class='del'>-/*  	gtk_widget_set_sensitive (ee-&gt;recur_ex_vbox, TRUE); */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recurrence_exception_added (GtkWidget *widget, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = e_dialog_dateedit_get (priv-&gt;recurrence_exceptions_date);</div><div class='del'>-	append_exception (ee, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recurrence_exception_deleted (GtkWidget *widget, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	int sel;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;recurrence_exceptions_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'>-	g_free (gtk_clist_get_row_data (clist, sel)); /* free the time_t stored there */</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'>-	gtk_clist_select_row (clist, sel, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recurrence_exception_changed (GtkWidget *widget, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	time_t *t;</div><div class='del'>-	int sel;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;recurrence_exceptions_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'>-	t = gtk_clist_get_row_data (clist, sel);</div><div class='del'>-	*t = e_dialog_dateedit_get (priv-&gt;recurrence_exceptions_date);</div><div class='del'>-</div><div class='del'>-	gtk_clist_set_text (clist, sel, 0, get_exception_string (*t));</div><div class='del'>-}</div><div class='del'>-</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 date_edit_new (time (NULL), FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-make_date_edit_with_time (void)</div><div class='del'>-{</div><div class='del'>-	return date_edit_new (time (NULL), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-date_edit_new (time_t the_time, int show_time)</div><div class='del'>-{</div><div class='del'>-	return gnome_date_edit_new_flags (the_time,</div><div class='del'>-					  ((show_time ? GNOME_DATE_EDIT_SHOW_TIME : 0)</div><div class='del'>-					   | (am_pm_flag ? 0 : GNOME_DATE_EDIT_24_HR)</div><div class='del'>-					   | (week_starts_on_monday</div><div class='del'>-					      ? GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY</div><div class='del'>-					      : 0)));</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'>-make_spin_button (int val, int low, int high)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GtkWidget *spin;</div><div class='del'>-</div><div class='del'>-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (val, low, high, 1, 10, 10));</div><div class='del'>-	spin = gtk_spin_button_new (adj, 0.5, 0);</div><div class='del'>-	gtk_widget_set_usize (spin, 60, 0);</div><div class='del'>-</div><div class='del'>-	return spin;</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'>-   build some of the recur stuff by hand to take into account</div><div class='del'>-   the start-on-monday preference?</div><div class='del'>-</div><div class='del'>-   get the apply button to work right</div><div class='del'>-</div><div class='del'>-   make the properties stuff unglobal</div><div class='del'>-</div><div class='del'>-   figure out why alarm units aren't sticking between edits</div><div class='del'>-</div><div class='del'>-   closing the dialog window with the wm caused a crash</div><div class='del'>-   Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'</div><div class='del'>-   on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog-&gt;dialog));</div><div class='del'>- */</div><div class='head'>diff --git a/calendar/gui/event-editor.h b/calendar/gui/event-editor.h<br/>deleted file mode 100644<br/>index 7f5cedf37c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/event-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/* Evolution calendar - Event editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@helixcode.com&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'>-#ifndef __EVENT_EDITOR_DIALOG_H__</div><div class='del'>-#define __EVENT_EDITOR_DIALOG_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 "gnome-cal.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,	\</div><div class='del'>-				      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'>-</div><div class='del'>-struct _EventEditor {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EventEditorClass {</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 (* save_ical_object) (EventEditor *ee, iCalObject *ico);</div><div class='del'>-	void (* ical_object_released) (EventEditor *ee, const char *uid);</div><div class='del'>-	void (* editor_closed) (EventEditor *ee);</div><div class='del'>-};</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'>-</div><div class='del'>-EventEditor *event_editor_new (void);</div><div class='del'>-</div><div class='del'>-void event_editor_set_ical_object (EventEditor *ee, iCalObject *ico);</div><div class='del'>-</div><div class='del'>-void event_editor_focus (EventEditor *ee);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Convenience function to create and show a new event editor for an</div><div class='del'>- * event that goes from day_begin to day_end of the specified day.</div><div class='del'>- */</div><div class='del'>-void event_editor_new_whole_day (GnomeCalendar *owner, time_t day);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-GtkWidget *make_date_edit (void);</div><div class='del'>-GtkWidget *make_date_edit_with_time (void);</div><div class='del'>-GtkWidget *date_edit_new (time_t the_time, int show_time);</div><div class='del'>-</div><div class='del'>-GtkWidget *make_spin_button (int val, int low, int high);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __EVENT_EDITOR_DIALOG_H__ */</div><div class='head'>diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c<br/>deleted file mode 100644<br/>index 2e5e7741da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/evolution-calendar-control.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/evolution-calendar-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,200 +0,0 @@</div><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 &lt;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.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 &lt;gui/alarm.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'>-#define PROPERTY_CALENDAR_URI "folder_uri"</div><div class='del'>-</div><div class='del'>-#define PROPERTY_CALENDAR_URI_IDX 1</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"</div><div class='del'>-#else</div><div class='del'>-#define CONTROL_FACTORY_ID   "control-factory:calendar"</div><div class='del'>-#endif</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, </div><div class='del'>-		     gboolean activate, </div><div class='del'>-		     gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	if (activate)</div><div class='del'>-		calendar_control_activate (control, user_data);</div><div class='del'>-	else</div><div class='del'>-		calendar_control_deactivate (control);</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_bonobo (int *argc, char **argv)</div><div class='del'>-{</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-	/* FIXME: VERSION instead of "0.0".  */</div><div class='del'>-	gnome_init_with_popt_table ("evolution-calendar", "0.0",</div><div class='del'>-				    *argc, argv, oaf_popt_options,</div><div class='del'>-				    0, NULL);</div><div class='del'>-	oaf_init (*argc, argv);</div><div class='del'>-#else</div><div class='del'>-	gnome_CORBA_init_with_popt_table (</div><div class='del'>-		"evolution-calendar", "0.0",</div><div class='del'>-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &amp;ev);</div><div class='del'>-#endif</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'>-	glade_gnome_init ();</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_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  BonoboArg         *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	/*GnomeCalendar *gcal = user_data;*/</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'>-		/*</div><div class='del'>-		if (fb &amp;&amp; fb-&gt;uri)</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, fb-&gt;uri);</div><div class='del'>-		else</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "");</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'>-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'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = user_data;</div><div class='del'>-	char *filename;</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'>-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		filename = g_strdup_printf ("%s/calendar.vcf",</div><div class='del'>-					    BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		calendar_set_uri (gcal, filename);</div><div class='del'>-		g_free (filename);</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)</div><div class='del'>-{</div><div class='del'>-	gcal-&gt;properties = bonobo_property_bag_new (get_prop, set_prop, gcal);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (gcal-&gt;properties,</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'>-</div><div class='del'>-	bonobo_control_set_property_bag (gcal-&gt;control, gcal-&gt;properties);</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'>-calendar_control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-	GnomeCalendar *cal = new_calendar (full_name, NULL, NULL, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (cal));</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (GTK_WIDGET (cal));</div><div class='del'>-	cal-&gt;control = control;</div><div class='del'>-</div><div class='del'>-	calendar_properties_init (cal);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-			    control_activate_cb, cal);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_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'>-	puts ("XXXXXX - initializing calendar factory!!!");</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, calendar_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 Calendar control 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, char **argv)</div><div class='del'>-{</div><div class='del'>-	init_bonobo (&amp;argc, argv);</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-	alarm_init ();</div><div class='del'>-</div><div class='del'>-	init_calendar ();</div><div class='del'>-</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'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	calendar_control_factory_init ();</div><div class='del'>-	component_factory_init ();</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/calendar/gui/evolution-calendar.gnorba b/calendar/gui/evolution-calendar.gnorba<br/>deleted file mode 100644<br/>index e2f1107926..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/evolution-calendar.gnorba?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/evolution-calendar.gnorba</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-[evolution-shell-component-factory:evolution-calendar]</div><div class='del'>-type=exe</div><div class='del'>-repo_id=IDL:Bonobo/GenericFactory:1.0</div><div class='del'>-description=Factory for the Evolution calendar component.</div><div class='del'>-location_info=evolution-calendar</div><div class='del'>-</div><div class='del'>-[evolution-shell-component:evolution-calendar]</div><div class='del'>-type=factory</div><div class='del'>-repo_id=IDL:Evolution/ShellComponent:1.0</div><div class='del'>-description=Evolution component for handling the calendar.</div><div class='del'>-location_info=evolution-shell-component-factory:evolution-calendar</div><div class='head'>diff --git a/calendar/gui/evolution-calendar.oafinfo b/calendar/gui/evolution-calendar.oafinfo<br/>deleted file mode 100644<br/>index c8a4907854..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/evolution-calendar.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/evolution-calendar.oafinfo</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:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</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:Bonobo/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 Evolution calendar component."/&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:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"&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/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_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/getdate.y b/calendar/gui/getdate.y<br/>deleted file mode 100644<br/>index 6df71bddda..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/getdate.y?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/getdate.y</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1001 +0,0 @@</div><div class='del'>-%{</div><div class='del'>-/*</div><div class='del'>-**  Originally) written by Steven M. Bellovin &lt;smb@research.att.com&gt; while</div><div class='del'>-**  at the University of North Carolina at Chapel Hill.  Later tweaked by</div><div class='del'>-**  a couple of people on Usenet.  Completely overhauled by Rich $alz</div><div class='del'>-**  &lt;rsalz@bbn.com&gt; and Jim Berets &lt;jberets@bbn.com&gt; in August, 1990;</div><div class='del'>-**  send any email to Rich.</div><div class='del'>-**</div><div class='del'>-**  This grammar has 10 shift/reduce conflicts.</div><div class='del'>-**</div><div class='del'>-**  This code is in the public domain and has no copyright.</div><div class='del'>-*/</div><div class='del'>-/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */</div><div class='del'>-/* SUPPRESS 288 on yyerrlab *//* Label unused */</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'>-	</div><div class='del'>-/* Since the code of getdate.y is not included in the Emacs executable</div><div class='del'>-   itself, there is no need to #define static in this file.  Even if</div><div class='del'>-   the code were included in the Emacs executable, it probably</div><div class='del'>-   wouldn't do any harm to #undef it here; this will only cause</div><div class='del'>-   problems if we try to write to a static variable, which I don't</div><div class='del'>-   think this code needs to do.  */</div><div class='del'>-#ifdef emacs</div><div class='del'>-#undef static</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'>-</div><div class='del'>-/* The code at the top of get_date which figures out the offset of the</div><div class='del'>-   current time zone checks various CPP symbols to see if special</div><div class='del'>-   tricks are need, but defaults to using the gettimeofday system call.</div><div class='del'>-   Include &lt;sys/time.h&gt; if that will be used.  */</div><div class='del'>-</div><div class='del'>-#if	defined(vms)</div><div class='del'>-</div><div class='del'>-#include &lt;types.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef TIME_WITH_SYS_TIME</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#else</div><div class='del'>-#ifdef HAVE_SYS_TIME_H</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef timezone</div><div class='del'>-#undef timezone /* needed for sgi */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(HAVE_SYS_TIMEB_H)</div><div class='del'>-#include &lt;sys/timeb.h&gt;</div><div class='del'>-#else</div><div class='del'>-/*</div><div class='del'>-** We use the obsolete `struct timeb' as part of our interface!</div><div class='del'>-** Since the system doesn't have it, we define it here;</div><div class='del'>-** our callers must do likewise.</div><div class='del'>-*/</div><div class='del'>-struct timeb {</div><div class='del'>-    time_t		time;		/* Seconds since the epoch	*/</div><div class='del'>-    unsigned short	millitm;	/* Field not used		*/</div><div class='del'>-    short		timezone;	/* Minutes west of GMT		*/</div><div class='del'>-    short		dstflag;	/* Field not used		*/</div><div class='del'>-};</div><div class='del'>-#endif /* defined(HAVE_SYS_TIMEB_H) */</div><div class='del'>-</div><div class='del'>-#endif	/* defined(vms) */</div><div class='del'>-</div><div class='del'>-#if defined (STDC_HEADERS) || defined (USG)</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Some old versions of bison generate parsers that use bcopy.</div><div class='del'>-   That loses on systems that don't provide the function, so we have</div><div class='del'>-   to redefine it here.  */</div><div class='del'>-#if !defined (HAVE_BCOPY) &amp;&amp; defined (HAVE_MEMCPY) &amp;&amp; !defined (bcopy)</div><div class='del'>-#define bcopy(from, to, len) memcpy ((to), (from), (len))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined (STDC_HEADERS)</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* NOTES on rebuilding getdate.c (particularly for inclusion in CVS</div><div class='del'>-   releases):</div><div class='del'>-</div><div class='del'>-   We don't want to mess with all the portability hassles of alloca.</div><div class='del'>-   In particular, most (all?) versions of bison will use alloca in</div><div class='del'>-   their parser.  If bison works on your system (e.g. it should work</div><div class='del'>-   with gcc), then go ahead and use it, but the more general solution</div><div class='del'>-   is to use byacc instead of bison, which should generate a portable</div><div class='del'>-   parser.  I played with adding "#define alloca dont_use_alloca", to</div><div class='del'>-   give an error if the parser generator uses alloca (and thus detect</div><div class='del'>-   unportable getdate.c's), but that seems to cause as many problems</div><div class='del'>-   as it solves.  */</div><div class='del'>-</div><div class='del'>-extern struct tm	*gmtime();</div><div class='del'>-extern struct tm	*localtime();</div><div class='del'>-</div><div class='del'>-#define yyparse getdate_yyparse</div><div class='del'>-#define yylex getdate_yylex</div><div class='del'>-#define yyerror getdate_yyerror</div><div class='del'>-</div><div class='del'>-static int yylex ();</div><div class='del'>-static int yyerror ();</div><div class='del'>-</div><div class='del'>-#define EPOCH		1970</div><div class='del'>-#define HOUR(x)		((time_t)(x) * 60)</div><div class='del'>-#define SECSPERDAY	(24L * 60L * 60L)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**  An entry in the lexical lookup table.</div><div class='del'>-*/</div><div class='del'>-typedef struct _TABLE {</div><div class='del'>-    char	*name;</div><div class='del'>-    int		type;</div><div class='del'>-    time_t	value;</div><div class='del'>-} TABLE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**  Daylight-savings mode:  on, off, or not yet known.</div><div class='del'>-*/</div><div class='del'>-typedef enum _DSTMODE {</div><div class='del'>-    DSTon, DSToff, DSTmaybe</div><div class='del'>-} DSTMODE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**  Meridian:  am, pm, or 24-hour style.</div><div class='del'>-*/</div><div class='del'>-typedef enum _MERIDIAN {</div><div class='del'>-    MERam, MERpm, MER24</div><div class='del'>-} MERIDIAN;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**  Global variables.  We could get rid of most of these by using a good</div><div class='del'>-**  union as the yacc stack.  (This routine was originally written before</div><div class='del'>-**  yacc had the %union construct.)  Maybe someday; right now we only use</div><div class='del'>-**  the %union very rarely.</div><div class='del'>-*/</div><div class='del'>-static char	*yyInput;</div><div class='del'>-static DSTMODE	yyDSTmode;</div><div class='del'>-static time_t	yyDayOrdinal;</div><div class='del'>-static time_t	yyDayNumber;</div><div class='del'>-static int	yyHaveDate;</div><div class='del'>-static int	yyHaveDay;</div><div class='del'>-static int	yyHaveRel;</div><div class='del'>-static int	yyHaveTime;</div><div class='del'>-static int	yyHaveZone;</div><div class='del'>-static time_t	yyTimezone;</div><div class='del'>-static time_t	yyDay;</div><div class='del'>-static time_t	yyHour;</div><div class='del'>-static time_t	yyMinutes;</div><div class='del'>-static time_t	yyMonth;</div><div class='del'>-static time_t	yySeconds;</div><div class='del'>-static time_t	yyYear;</div><div class='del'>-static MERIDIAN	yyMeridian;</div><div class='del'>-static time_t	yyRelMonth;</div><div class='del'>-static time_t	yyRelSeconds;</div><div class='del'>-</div><div class='del'>-%}</div><div class='del'>-</div><div class='del'>-%union {</div><div class='del'>-    time_t		Number;</div><div class='del'>-    enum _MERIDIAN	Meridian;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-%token	tAGO tDAY tDAYZONE tID tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT</div><div class='del'>-%token	tSEC_UNIT tSNUMBER tUNUMBER tZONE tDST</div><div class='del'>-</div><div class='del'>-%type	&lt;Number&gt;	tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT</div><div class='del'>-%type	&lt;Number&gt;	tSEC_UNIT tSNUMBER tUNUMBER tZONE</div><div class='del'>-%type	&lt;Meridian&gt;	tMERIDIAN o_merid</div><div class='del'>-</div><div class='del'>-%%</div><div class='del'>-</div><div class='del'>-spec	: /* NULL */</div><div class='del'>-	| spec item</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-item	: time {</div><div class='del'>-	    yyHaveTime++;</div><div class='del'>-	}</div><div class='del'>-	| zone {</div><div class='del'>-	    yyHaveZone++;</div><div class='del'>-	}</div><div class='del'>-	| date {</div><div class='del'>-	    yyHaveDate++;</div><div class='del'>-	}</div><div class='del'>-	| day {</div><div class='del'>-	    yyHaveDay++;</div><div class='del'>-	}</div><div class='del'>-	| rel {</div><div class='del'>-	    yyHaveRel++;</div><div class='del'>-	}</div><div class='del'>-	| number</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-time	: tUNUMBER tMERIDIAN {</div><div class='del'>-	    yyHour = $1;</div><div class='del'>-	    yyMinutes = 0;</div><div class='del'>-	    yySeconds = 0;</div><div class='del'>-	    yyMeridian = $2;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER ':' tUNUMBER o_merid {</div><div class='del'>-	    yyHour = $1;</div><div class='del'>-	    yyMinutes = $3;</div><div class='del'>-	    yySeconds = 0;</div><div class='del'>-	    yyMeridian = $4;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER ':' tUNUMBER tSNUMBER {</div><div class='del'>-	    yyHour = $1;</div><div class='del'>-	    yyMinutes = $3;</div><div class='del'>-	    yyMeridian = MER24;</div><div class='del'>-	    yyDSTmode = DSToff;</div><div class='del'>-	    yyTimezone = - ($4 % 100 + ($4 / 100) * 60);</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {</div><div class='del'>-	    yyHour = $1;</div><div class='del'>-	    yyMinutes = $3;</div><div class='del'>-	    yySeconds = $5;</div><div class='del'>-	    yyMeridian = $6;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {</div><div class='del'>-	    yyHour = $1;</div><div class='del'>-	    yyMinutes = $3;</div><div class='del'>-	    yySeconds = $5;</div><div class='del'>-	    yyMeridian = MER24;</div><div class='del'>-	    yyDSTmode = DSToff;</div><div class='del'>-	    yyTimezone = - ($6 % 100 + ($6 / 100) * 60);</div><div class='del'>-	}</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-zone	: tZONE {</div><div class='del'>-	    yyTimezone = $1;</div><div class='del'>-	    yyDSTmode = DSToff;</div><div class='del'>-	}</div><div class='del'>-	| tDAYZONE {</div><div class='del'>-	    yyTimezone = $1;</div><div class='del'>-	    yyDSTmode = DSTon;</div><div class='del'>-	}</div><div class='del'>-	|</div><div class='del'>-	  tZONE tDST {</div><div class='del'>-	    yyTimezone = $1;</div><div class='del'>-	    yyDSTmode = DSTon;</div><div class='del'>-	}</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-day	: tDAY {</div><div class='del'>-	    yyDayOrdinal = 1;</div><div class='del'>-	    yyDayNumber = $1;</div><div class='del'>-	}</div><div class='del'>-	| tDAY ',' {</div><div class='del'>-	    yyDayOrdinal = 1;</div><div class='del'>-	    yyDayNumber = $1;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tDAY {</div><div class='del'>-	    yyDayOrdinal = $1;</div><div class='del'>-	    yyDayNumber = $2;</div><div class='del'>-	}</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-date	: tUNUMBER '/' tUNUMBER {</div><div class='del'>-	    yyMonth = $1;</div><div class='del'>-	    yyDay = $3;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {</div><div class='del'>-	    yyMonth = $1;</div><div class='del'>-	    yyDay = $3;</div><div class='del'>-	    yyYear = $5;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tSNUMBER tSNUMBER {</div><div class='del'>-	    /* ISO 8601 format.  yyyy-mm-dd.  */</div><div class='del'>-	    yyYear = $1;</div><div class='del'>-	    yyMonth = -$2;</div><div class='del'>-	    yyDay = -$3;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tMONTH tSNUMBER {</div><div class='del'>-	    /* e.g. 17-JUN-1992.  */</div><div class='del'>-	    yyDay = $1;</div><div class='del'>-	    yyMonth = $2;</div><div class='del'>-	    yyYear = -$3;</div><div class='del'>-	}</div><div class='del'>-	| tMONTH tUNUMBER {</div><div class='del'>-	    yyMonth = $1;</div><div class='del'>-	    yyDay = $2;</div><div class='del'>-	}</div><div class='del'>-	| tMONTH tUNUMBER ',' tUNUMBER {</div><div class='del'>-	    yyMonth = $1;</div><div class='del'>-	    yyDay = $2;</div><div class='del'>-	    yyYear = $4;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tMONTH {</div><div class='del'>-	    yyMonth = $2;</div><div class='del'>-	    yyDay = $1;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tMONTH tUNUMBER {</div><div class='del'>-	    yyMonth = $2;</div><div class='del'>-	    yyDay = $1;</div><div class='del'>-	    yyYear = $3;</div><div class='del'>-	}</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-rel	: relunit tAGO {</div><div class='del'>-	    yyRelSeconds = -yyRelSeconds;</div><div class='del'>-	    yyRelMonth = -yyRelMonth;</div><div class='del'>-	}</div><div class='del'>-	| relunit</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-relunit	: tUNUMBER tMINUTE_UNIT {</div><div class='del'>-	    yyRelSeconds += $1 * $2 * 60L;</div><div class='del'>-	}</div><div class='del'>-	| tSNUMBER tMINUTE_UNIT {</div><div class='del'>-	    yyRelSeconds += $1 * $2 * 60L;</div><div class='del'>-	}</div><div class='del'>-	| tMINUTE_UNIT {</div><div class='del'>-	    yyRelSeconds += $1 * 60L;</div><div class='del'>-	}</div><div class='del'>-	| tSNUMBER tSEC_UNIT {</div><div class='del'>-	    yyRelSeconds += $1;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tSEC_UNIT {</div><div class='del'>-	    yyRelSeconds += $1;</div><div class='del'>-	}</div><div class='del'>-	| tSEC_UNIT {</div><div class='del'>-	    yyRelSeconds++;</div><div class='del'>-	}</div><div class='del'>-	| tSNUMBER tMONTH_UNIT {</div><div class='del'>-	    yyRelMonth += $1 * $2;</div><div class='del'>-	}</div><div class='del'>-	| tUNUMBER tMONTH_UNIT {</div><div class='del'>-	    yyRelMonth += $1 * $2;</div><div class='del'>-	}</div><div class='del'>-	| tMONTH_UNIT {</div><div class='del'>-	    yyRelMonth += $1;</div><div class='del'>-	}</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-number	: tUNUMBER {</div><div class='del'>-	    if (yyHaveTime &amp;&amp; yyHaveDate &amp;&amp; !yyHaveRel)</div><div class='del'>-		yyYear = $1;</div><div class='del'>-	    else {</div><div class='del'>-		if($1&gt;10000) {</div><div class='del'>-		    yyHaveDate++;</div><div class='del'>-		    yyDay= ($1)%100;</div><div class='del'>-		    yyMonth= ($1/100)%100;</div><div class='del'>-		    yyYear = $1/10000;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-		    yyHaveTime++;</div><div class='del'>-		    if ($1 &lt; 100) {</div><div class='del'>-			yyHour = $1;</div><div class='del'>-			yyMinutes = 0;</div><div class='del'>-		    }</div><div class='del'>-		    else {</div><div class='del'>-		    	yyHour = $1 / 100;</div><div class='del'>-		    	yyMinutes = $1 % 100;</div><div class='del'>-		    }</div><div class='del'>-		    yySeconds = 0;</div><div class='del'>-		    yyMeridian = MER24;</div><div class='del'>-	        }</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	;</div><div class='del'>-</div><div class='del'>-o_merid	: /* NULL */ {</div><div class='del'>-	    $$ = MER24;</div><div class='del'>-	}</div><div class='del'>-	| tMERIDIAN {</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'>-</div><div class='del'>-/* Month and day table. */</div><div class='del'>-static TABLE const MonthDayTable[] = {</div><div class='del'>-    { N_("january"),	tMONTH,  1 },</div><div class='del'>-    { N_("february"),	tMONTH,  2 },</div><div class='del'>-    { N_("march"),		tMONTH,  3 },</div><div class='del'>-    { N_("april"),		tMONTH,  4 },</div><div class='del'>-    { N_("may"),		tMONTH,  5 },</div><div class='del'>-    { N_("june"),		tMONTH,  6 },</div><div class='del'>-    { N_("july"),		tMONTH,  7 },</div><div class='del'>-    { N_("august"),		tMONTH,  8 },</div><div class='del'>-    { N_("september"),	tMONTH,  9 },</div><div class='del'>-    { N_("sept"),		tMONTH,  9 },</div><div class='del'>-    { N_("october"),	tMONTH, 10 },</div><div class='del'>-    { N_("november"),	tMONTH, 11 },</div><div class='del'>-    { N_("december"),	tMONTH, 12 },</div><div class='del'>-    { N_("sunday"),		tDAY, 0 },</div><div class='del'>-    { N_("monday"),		tDAY, 1 },</div><div class='del'>-    { N_("tuesday"),	tDAY, 2 },</div><div class='del'>-    { N_("tues"),		tDAY, 2 },</div><div class='del'>-    { N_("wednesday"),	tDAY, 3 },</div><div class='del'>-    { N_("wednes"),		tDAY, 3 },</div><div class='del'>-    { N_("thursday"),	tDAY, 4 },</div><div class='del'>-    { N_("thur"),		tDAY, 4 },</div><div class='del'>-    { N_("thurs"),		tDAY, 4 },</div><div class='del'>-    { N_("friday"),		tDAY, 5 },</div><div class='del'>-    { N_("saturday"),	tDAY, 6 },</div><div class='del'>-    { NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Time units table. */</div><div class='del'>-static TABLE const UnitsTable[] = {</div><div class='del'>-    { N_("year"),		tMONTH_UNIT,	12 },</div><div class='del'>-    { N_("month"),		tMONTH_UNIT,	1 },</div><div class='del'>-    { N_("fortnight"),	tMINUTE_UNIT,	14 * 24 * 60 },</div><div class='del'>-    { N_("week"),		tMINUTE_UNIT,	7 * 24 * 60 },</div><div class='del'>-    { N_("day"),		tMINUTE_UNIT,	1 * 24 * 60 },</div><div class='del'>-    { N_("hour"),		tMINUTE_UNIT,	60 },</div><div class='del'>-    { N_("minute"),		tMINUTE_UNIT,	1 },</div><div class='del'>-    { N_("min"),		tMINUTE_UNIT,	1 },</div><div class='del'>-    { N_("second"),		tSEC_UNIT,	1 },</div><div class='del'>-    { N_("sec"),		tSEC_UNIT,	1 },</div><div class='del'>-    { NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Assorted relative-time words. */</div><div class='del'>-static TABLE const OtherTable[] = {</div><div class='del'>-    { N_("tomorrow"),	tMINUTE_UNIT,	1 * 24 * 60 },</div><div class='del'>-    { N_("yesterday"),	tMINUTE_UNIT,	-1 * 24 * 60 },</div><div class='del'>-    { N_("today"),		tMINUTE_UNIT,	0 },</div><div class='del'>-    { N_("now"),		tMINUTE_UNIT,	0 },</div><div class='del'>-    { N_("last"),		tUNUMBER,	-1 },</div><div class='del'>-    { N_("this"),		tMINUTE_UNIT,	0 },</div><div class='del'>-    { N_("next"),		tUNUMBER,	2 },</div><div class='del'>-    { N_("first"),		tUNUMBER,	1 },</div><div class='del'>-/*  { N_("second"),		tUNUMBER,	2 }, */</div><div class='del'>-    { N_("third"),		tUNUMBER,	3 },</div><div class='del'>-    { N_("fourth"),		tUNUMBER,	4 },</div><div class='del'>-    { N_("fifth"),		tUNUMBER,	5 },</div><div class='del'>-    { N_("sixth"),		tUNUMBER,	6 },</div><div class='del'>-    { N_("seventh"),	tUNUMBER,	7 },</div><div class='del'>-    { N_("eighth"),		tUNUMBER,	8 },</div><div class='del'>-    { N_("ninth"),		tUNUMBER,	9 },</div><div class='del'>-    { N_("tenth"),		tUNUMBER,	10 },</div><div class='del'>-    { N_("eleventh"),	tUNUMBER,	11 },</div><div class='del'>-    { N_("twelfth"),	tUNUMBER,	12 },</div><div class='del'>-    { N_("ago"),		tAGO,	1 },</div><div class='del'>-    { NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The timezone table. */</div><div class='del'>-/* Some of these are commented out because a time_t can't store a float. */</div><div class='del'>-static TABLE const TimezoneTable[] = {</div><div class='del'>-    { "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */</div><div class='del'>-    { "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */</div><div class='del'>-    { "utc",	tZONE,     HOUR( 0) },</div><div class='del'>-    { "wet",	tZONE,     HOUR( 0) },	/* Western European */</div><div class='del'>-    { "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */</div><div class='del'>-    { "wat",	tZONE,     HOUR( 1) },	/* West Africa */</div><div class='del'>-    { "at",	tZONE,     HOUR( 2) },	/* Azores */</div><div class='del'>-#if	0</div><div class='del'>-    /* For completeness.  BST is also British Summer, and GST is</div><div class='del'>-     * also Guam Standard. */</div><div class='del'>-    { "bst",	tZONE,     HOUR( 3) },	/* Brazil Standard */</div><div class='del'>-    { "gst",	tZONE,     HOUR( 3) },	/* Greenland Standard */</div><div class='del'>-#endif</div><div class='del'>-#if 0</div><div class='del'>-    { "nft",	tZONE,     HOUR(3.5) },	/* Newfoundland */</div><div class='del'>-    { "nst",	tZONE,     HOUR(3.5) },	/* Newfoundland Standard */</div><div class='del'>-    { "ndt",	tDAYZONE,  HOUR(3.5) },	/* Newfoundland Daylight */</div><div class='del'>-#endif</div><div class='del'>-    { "ast",	tZONE,     HOUR( 4) },	/* Atlantic Standard */</div><div class='del'>-    { "adt",	tDAYZONE,  HOUR( 4) },	/* Atlantic Daylight */</div><div class='del'>-    { "est",	tZONE,     HOUR( 5) },	/* Eastern Standard */</div><div class='del'>-    { "edt",	tDAYZONE,  HOUR( 5) },	/* Eastern Daylight */</div><div class='del'>-    { "cst",	tZONE,     HOUR( 6) },	/* Central Standard */</div><div class='del'>-    { "cdt",	tDAYZONE,  HOUR( 6) },	/* Central Daylight */</div><div class='del'>-    { "mst",	tZONE,     HOUR( 7) },	/* Mountain Standard */</div><div class='del'>-    { "mdt",	tDAYZONE,  HOUR( 7) },	/* Mountain Daylight */</div><div class='del'>-    { "pst",	tZONE,     HOUR( 8) },	/* Pacific Standard */</div><div class='del'>-    { "pdt",	tDAYZONE,  HOUR( 8) },	/* Pacific Daylight */</div><div class='del'>-    { "yst",	tZONE,     HOUR( 9) },	/* Yukon Standard */</div><div class='del'>-    { "ydt",	tDAYZONE,  HOUR( 9) },	/* Yukon Daylight */</div><div class='del'>-    { "hst",	tZONE,     HOUR(10) },	/* Hawaii Standard */</div><div class='del'>-    { "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */</div><div class='del'>-    { "cat",	tZONE,     HOUR(10) },	/* Central Alaska */</div><div class='del'>-    { "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */</div><div class='del'>-    { "nt",	tZONE,     HOUR(11) },	/* Nome */</div><div class='del'>-    { "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */</div><div class='del'>-    { "cet",	tZONE,     -HOUR(1) },	/* Central European */</div><div class='del'>-    { "met",	tZONE,     -HOUR(1) },	/* Middle European */</div><div class='del'>-    { "mewt",	tZONE,     -HOUR(1) },	/* Middle European Winter */</div><div class='del'>-    { "mest",	tDAYZONE,  -HOUR(1) },	/* Middle European Summer */</div><div class='del'>-    { "swt",	tZONE,     -HOUR(1) },	/* Swedish Winter */</div><div class='del'>-    { "sst",	tDAYZONE,  -HOUR(1) },	/* Swedish Summer */</div><div class='del'>-    { "fwt",	tZONE,     -HOUR(1) },	/* French Winter */</div><div class='del'>-    { "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */</div><div class='del'>-    { "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */</div><div class='del'>-    { "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */</div><div class='del'>-#if 0</div><div class='del'>-    { "it",	tZONE,     -HOUR(3.5) },/* Iran */</div><div class='del'>-#endif</div><div class='del'>-    { "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */</div><div class='del'>-    { "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */</div><div class='del'>-#if 0</div><div class='del'>-    { "ist",	tZONE,     -HOUR(5.5) },/* Indian Standard */</div><div class='del'>-#endif</div><div class='del'>-    { "zp6",	tZONE,     -HOUR(6) },	/* USSR Zone 5 */</div><div class='del'>-#if	0</div><div class='del'>-    /* For completeness.  NST is also Newfoundland Stanard, and SST is</div><div class='del'>-     * also Swedish Summer. */</div><div class='del'>-    { "nst",	tZONE,     -HOUR(6.5) },/* North Sumatra */</div><div class='del'>-    { "sst",	tZONE,     -HOUR(7) },	/* South Sumatra, USSR Zone 6 */</div><div class='del'>-#endif	/* 0 */</div><div class='del'>-    { "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */</div><div class='del'>-    { "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */</div><div class='del'>-#if 0</div><div class='del'>-    { "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */</div><div class='del'>-#endif</div><div class='del'>-    { "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */</div><div class='del'>-    { "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */</div><div class='del'>-#if 0</div><div class='del'>-    { "cast",	tZONE,     -HOUR(9.5) },/* Central Australian Standard */</div><div class='del'>-    { "cadt",	tDAYZONE,  -HOUR(9.5) },/* Central Australian Daylight */</div><div class='del'>-#endif</div><div class='del'>-    { "east",	tZONE,     -HOUR(10) },	/* Eastern Australian Standard */</div><div class='del'>-    { "eadt",	tDAYZONE,  -HOUR(10) },	/* Eastern Australian Daylight */</div><div class='del'>-    { "gst",	tZONE,     -HOUR(10) },	/* Guam Standard, USSR Zone 9 */</div><div class='del'>-    { "nzt",	tZONE,     -HOUR(12) },	/* New Zealand */</div><div class='del'>-    { "nzst",	tZONE,     -HOUR(12) },	/* New Zealand Standard */</div><div class='del'>-    { "nzdt",	tDAYZONE,  -HOUR(12) },	/* New Zealand Daylight */</div><div class='del'>-    { "idle",	tZONE,     -HOUR(12) },	/* International Date Line East */</div><div class='del'>-    {  NULL  }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Military timezone table. */</div><div class='del'>-static TABLE const MilitaryTable[] = {</div><div class='del'>-    { "a",	tZONE,	HOUR(  1) },</div><div class='del'>-    { "b",	tZONE,	HOUR(  2) },</div><div class='del'>-    { "c",	tZONE,	HOUR(  3) },</div><div class='del'>-    { "d",	tZONE,	HOUR(  4) },</div><div class='del'>-    { "e",	tZONE,	HOUR(  5) },</div><div class='del'>-    { "f",	tZONE,	HOUR(  6) },</div><div class='del'>-    { "g",	tZONE,	HOUR(  7) },</div><div class='del'>-    { "h",	tZONE,	HOUR(  8) },</div><div class='del'>-    { "i",	tZONE,	HOUR(  9) },</div><div class='del'>-    { "k",	tZONE,	HOUR( 10) },</div><div class='del'>-    { "l",	tZONE,	HOUR( 11) },</div><div class='del'>-    { "m",	tZONE,	HOUR( 12) },</div><div class='del'>-    { "n",	tZONE,	HOUR(- 1) },</div><div class='del'>-    { "o",	tZONE,	HOUR(- 2) },</div><div class='del'>-    { "p",	tZONE,	HOUR(- 3) },</div><div class='del'>-    { "q",	tZONE,	HOUR(- 4) },</div><div class='del'>-    { "r",	tZONE,	HOUR(- 5) },</div><div class='del'>-    { "s",	tZONE,	HOUR(- 6) },</div><div class='del'>-    { "t",	tZONE,	HOUR(- 7) },</div><div class='del'>-    { "u",	tZONE,	HOUR(- 8) },</div><div class='del'>-    { "v",	tZONE,	HOUR(- 9) },</div><div class='del'>-    { "w",	tZONE,	HOUR(-10) },</div><div class='del'>-    { "x",	tZONE,	HOUR(-11) },</div><div class='del'>-    { "y",	tZONE,	HOUR(-12) },</div><div class='del'>-    { "z",	tZONE,	HOUR(  0) },</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'>-/* ARGSUSED */</div><div class='del'>-static int</div><div class='del'>-yyerror(s)</div><div class='del'>-    char	*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 time_t</div><div class='del'>-ToSeconds(Hours, Minutes, Seconds, Meridian)</div><div class='del'>-    time_t	Hours;</div><div class='del'>-    time_t	Minutes;</div><div class='del'>-    time_t	Seconds;</div><div class='del'>-    MERIDIAN	Meridian;</div><div class='del'>-{</div><div class='del'>-    if (Minutes &lt; 0 || Minutes &gt; 59 || Seconds &lt; 0 || Seconds &gt; 59)</div><div class='del'>-	return -1;</div><div class='del'>-    switch (Meridian) {</div><div class='del'>-    case MER24:</div><div class='del'>-	if (Hours &lt; 0 || Hours &gt; 23)</div><div class='del'>-	    return -1;</div><div class='del'>-	return (Hours * 60L + Minutes) * 60L + Seconds;</div><div class='del'>-    case MERam:</div><div class='del'>-	if (Hours &lt; 1 || Hours &gt; 12)</div><div class='del'>-	    return -1;</div><div class='del'>-	return (Hours * 60L + Minutes) * 60L + Seconds;</div><div class='del'>-    case MERpm:</div><div class='del'>-	if (Hours &lt; 1 || Hours &gt; 12)</div><div class='del'>-	    return -1;</div><div class='del'>-	return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;</div><div class='del'>-    default:</div><div class='del'>-	abort ();</div><div class='del'>-    }</div><div class='del'>-    /* NOTREACHED */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static time_t</div><div class='del'>-Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode)</div><div class='del'>-    time_t	Month;</div><div class='del'>-    time_t	Day;</div><div class='del'>-    time_t	Year;</div><div class='del'>-    time_t	Hours;</div><div class='del'>-    time_t	Minutes;</div><div class='del'>-    time_t	Seconds;</div><div class='del'>-    MERIDIAN	Meridian;</div><div class='del'>-    DSTMODE	DSTmode;</div><div class='del'>-{</div><div class='del'>-    static int DaysInMonth[12] = {</div><div class='del'>-	31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31</div><div class='del'>-    };</div><div class='del'>-    time_t	tod;</div><div class='del'>-    time_t	Julian;</div><div class='del'>-    int		i;</div><div class='del'>-</div><div class='del'>-    if (Year &lt; 0)</div><div class='del'>-	Year = -Year;</div><div class='del'>-    if (Year &lt; 100)</div><div class='del'>-	Year += 1900;</div><div class='del'>-    DaysInMonth[1] = Year % 4 == 0 &amp;&amp; (Year % 100 != 0 || Year % 400 == 0)</div><div class='del'>-		    ? 29 : 28;</div><div class='del'>-    if (Year &lt; EPOCH || Year &gt; 1999</div><div class='del'>-     || Month &lt; 1 || Month &gt; 12</div><div class='del'>-     /* Lint fluff:  "conversion from long may lose accuracy" */</div><div class='del'>-     || Day &lt; 1 || Day &gt; DaysInMonth[(int)--Month])</div><div class='del'>-	return -1;</div><div class='del'>-</div><div class='del'>-    for (Julian = Day - 1, i = 0; i &lt; Month; i++)</div><div class='del'>-	Julian += DaysInMonth[i];</div><div class='del'>-    for (i = EPOCH; i &lt; Year; i++)</div><div class='del'>-	Julian += 365 + (i % 4 == 0);</div><div class='del'>-    Julian *= SECSPERDAY;</div><div class='del'>-    Julian += yyTimezone * 60L;</div><div class='del'>-    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) &lt; 0)</div><div class='del'>-	return -1;</div><div class='del'>-    Julian += tod;</div><div class='del'>-    if (DSTmode == DSTon</div><div class='del'>-     || (DSTmode == DSTmaybe &amp;&amp; localtime(&amp;Julian)-&gt;tm_isdst))</div><div class='del'>-	Julian -= 60 * 60;</div><div class='del'>-    return Julian;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static time_t</div><div class='del'>-DSTcorrect(Start, Future)</div><div class='del'>-    time_t	Start;</div><div class='del'>-    time_t	Future;</div><div class='del'>-{</div><div class='del'>-    time_t	StartDay;</div><div class='del'>-    time_t	FutureDay;</div><div class='del'>-</div><div class='del'>-    StartDay = (localtime(&amp;Start)-&gt;tm_hour + 1) % 24;</div><div class='del'>-    FutureDay = (localtime(&amp;Future)-&gt;tm_hour + 1) % 24;</div><div class='del'>-    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static time_t</div><div class='del'>-RelativeDate(Start, DayOrdinal, DayNumber)</div><div class='del'>-    time_t	Start;</div><div class='del'>-    time_t	DayOrdinal;</div><div class='del'>-    time_t	DayNumber;</div><div class='del'>-{</div><div class='del'>-    struct tm	*tm;</div><div class='del'>-    time_t	now;</div><div class='del'>-</div><div class='del'>-    now = Start;</div><div class='del'>-    tm = localtime(&amp;now);</div><div class='del'>-    now += SECSPERDAY * ((DayNumber - tm-&gt;tm_wday + 7) % 7);</div><div class='del'>-    now += 7 * SECSPERDAY * (DayOrdinal &lt;= 0 ? DayOrdinal : DayOrdinal - 1);</div><div class='del'>-    return DSTcorrect(Start, now);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static time_t</div><div class='del'>-RelativeMonth(Start, RelMonth)</div><div class='del'>-    time_t	Start;</div><div class='del'>-    time_t	RelMonth;</div><div class='del'>-{</div><div class='del'>-    struct tm	*tm;</div><div class='del'>-    time_t	Month;</div><div class='del'>-    time_t	Year;</div><div class='del'>-</div><div class='del'>-    if (RelMonth == 0)</div><div class='del'>-	return 0;</div><div class='del'>-    tm = localtime(&amp;Start);</div><div class='del'>-    Month = 12 * tm-&gt;tm_year + tm-&gt;tm_mon + RelMonth;</div><div class='del'>-    Year = Month / 12;</div><div class='del'>-    Month = Month % 12 + 1;</div><div class='del'>-    return DSTcorrect(Start,</div><div class='del'>-	    Convert(Month, (time_t)tm-&gt;tm_mday, Year,</div><div class='del'>-		(time_t)tm-&gt;tm_hour, (time_t)tm-&gt;tm_min, (time_t)tm-&gt;tm_sec,</div><div class='del'>-		MER24, DSTmaybe));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-LookupWord(buff)</div><div class='del'>-    char		*buff;</div><div class='del'>-{</div><div class='del'>-    register char	*p;</div><div class='del'>-    register char	*q;</div><div class='del'>-    register const TABLE	*tp;</div><div class='del'>-    int			i;</div><div class='del'>-    int			abbrev;</div><div class='del'>-</div><div class='del'>-    /* Make it lowercase. */</div><div class='del'>-    for (p = buff; *p; p++)</div><div class='del'>-	if (isupper(*p))</div><div class='del'>-	    *p = tolower(*p);</div><div class='del'>-</div><div class='del'>-    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {</div><div class='del'>-	yylval.Meridian = MERam;</div><div class='del'>-	return tMERIDIAN;</div><div class='del'>-    }</div><div class='del'>-    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {</div><div class='del'>-	yylval.Meridian = MERpm;</div><div class='del'>-	return tMERIDIAN;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* See if we have an abbreviation for a month. */</div><div class='del'>-    if (strlen(buff) == 3)</div><div class='del'>-	abbrev = 1;</div><div class='del'>-    else if (strlen(buff) == 4 &amp;&amp; buff[3] == '.') {</div><div class='del'>-	abbrev = 1;</div><div class='del'>-	buff[3] = '\0';</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-	abbrev = 0;</div><div class='del'>-</div><div class='del'>-    for (tp = MonthDayTable; tp-&gt;name; tp++) {</div><div class='del'>-	if (abbrev) {</div><div class='del'>-	    if (strncmp(buff, tp-&gt;name, 3) == 0) {</div><div class='del'>-		yylval.Number = tp-&gt;value;</div><div class='del'>-		return tp-&gt;type;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	else if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-	    yylval.Number = tp-&gt;value;</div><div class='del'>-	    return tp-&gt;type;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    for (tp = TimezoneTable; tp-&gt;name; tp++)</div><div class='del'>-	if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-	    yylval.Number = tp-&gt;value;</div><div class='del'>-	    return tp-&gt;type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-    if (strcmp(buff, "dst") == 0) </div><div class='del'>-	return tDST;</div><div class='del'>-</div><div class='del'>-    for (tp = UnitsTable; tp-&gt;name; tp++)</div><div class='del'>-	if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-	    yylval.Number = tp-&gt;value;</div><div class='del'>-	    return tp-&gt;type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-    /* Strip off any plural and try the units table again. */</div><div class='del'>-    i = strlen(buff) - 1;</div><div class='del'>-    if (buff[i] == 's') {</div><div class='del'>-	buff[i] = '\0';</div><div class='del'>-	for (tp = UnitsTable; tp-&gt;name; tp++)</div><div class='del'>-	    if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-		yylval.Number = tp-&gt;value;</div><div class='del'>-		return tp-&gt;type;</div><div class='del'>-	    }</div><div class='del'>-	buff[i] = 's';		/* Put back for "this" in OtherTable. */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    for (tp = OtherTable; tp-&gt;name; tp++)</div><div class='del'>-	if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-	    yylval.Number = tp-&gt;value;</div><div class='del'>-	    return tp-&gt;type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-    /* Military timezones. */</div><div class='del'>-    if (buff[1] == '\0' &amp;&amp; isalpha(*buff)) {</div><div class='del'>-	for (tp = MilitaryTable; tp-&gt;name; tp++)</div><div class='del'>-	    if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-		yylval.Number = tp-&gt;value;</div><div class='del'>-		return tp-&gt;type;</div><div class='del'>-	    }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Drop out any periods and try the timezone table again. */</div><div class='del'>-    for (i = 0, p = q = buff; *q; q++)</div><div class='del'>-	if (*q != '.')</div><div class='del'>-	    *p++ = *q;</div><div class='del'>-	else</div><div class='del'>-	    i++;</div><div class='del'>-    *p = '\0';</div><div class='del'>-    if (i)</div><div class='del'>-	for (tp = TimezoneTable; tp-&gt;name; tp++)</div><div class='del'>-	    if (strcmp(buff, tp-&gt;name) == 0) {</div><div class='del'>-		yylval.Number = tp-&gt;value;</div><div class='del'>-		return tp-&gt;type;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-    return tID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-yylex()</div><div class='del'>-{</div><div class='del'>-    register char	c;</div><div class='del'>-    register char	*p;</div><div class='del'>-    char		buff[20];</div><div class='del'>-    int			Count;</div><div class='del'>-    int			sign;</div><div class='del'>-</div><div class='del'>-    for ( ; ; ) {</div><div class='del'>-	while (isspace(*yyInput))</div><div class='del'>-	    yyInput++;</div><div class='del'>-</div><div class='del'>-	if (isdigit(c = *yyInput) || c == '-' || c == '+') {</div><div class='del'>-	    if (c == '-' || c == '+') {</div><div class='del'>-		sign = c == '-' ? -1 : 1;</div><div class='del'>-		if (!isdigit(*++yyInput))</div><div class='del'>-		    /* skip the '-' sign */</div><div class='del'>-		    continue;</div><div class='del'>-	    }</div><div class='del'>-	    else</div><div class='del'>-		sign = 0;</div><div class='del'>-	    for (yylval.Number = 0; isdigit(c = *yyInput++); )</div><div class='del'>-		yylval.Number = 10 * yylval.Number + c - '0';</div><div class='del'>-	    yyInput--;</div><div class='del'>-	    if (sign &lt; 0)</div><div class='del'>-		yylval.Number = -yylval.Number;</div><div class='del'>-	    return sign ? tSNUMBER : tUNUMBER;</div><div class='del'>-	}</div><div class='del'>-	if (isalpha(c)) {</div><div class='del'>-	    for (p = buff; isalpha(c = *yyInput++) || c == '.'; )</div><div class='del'>-		if (p &lt; &amp;buff[sizeof buff - 1])</div><div class='del'>-		    *p++ = c;</div><div class='del'>-	    *p = '\0';</div><div class='del'>-	    yyInput--;</div><div class='del'>-	    return LookupWord(buff);</div><div class='del'>-	}</div><div class='del'>-	if (c != '(')</div><div class='del'>-	    return *yyInput++;</div><div class='del'>-	Count = 0;</div><div class='del'>-	do {</div><div class='del'>-	    c = *yyInput++;</div><div class='del'>-	    if (c == '\0')</div><div class='del'>-		return c;</div><div class='del'>-	    if (c == '(')</div><div class='del'>-		Count++;</div><div class='del'>-	    else if (c == ')')</div><div class='del'>-		Count--;</div><div class='del'>-	} while (Count &gt; 0);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define TM_YEAR_ORIGIN 1900</div><div class='del'>-</div><div class='del'>-/* Yield A - B, measured in seconds.  */</div><div class='del'>-static long</div><div class='del'>-difftm (a, b)</div><div class='del'>-     struct tm *a, *b;</div><div class='del'>-{</div><div class='del'>-  int ay = a-&gt;tm_year + (TM_YEAR_ORIGIN - 1);</div><div class='del'>-  int by = b-&gt;tm_year + (TM_YEAR_ORIGIN - 1);</div><div class='del'>-  int days = (</div><div class='del'>-	      /* difference in day of year */</div><div class='del'>-	      a-&gt;tm_yday - b-&gt;tm_yday</div><div class='del'>-	      /* + intervening leap days */</div><div class='del'>-	      +  ((ay &gt;&gt; 2) - (by &gt;&gt; 2))</div><div class='del'>-	      -  (ay/100 - by/100)</div><div class='del'>-	      +  ((ay/100 &gt;&gt; 2) - (by/100 &gt;&gt; 2))</div><div class='del'>-	      /* + difference in years * 365 */</div><div class='del'>-	      +  (long)(ay-by) * 365</div><div class='del'>-	      );</div><div class='del'>-  return (60*(60*(24*days + (a-&gt;tm_hour - b-&gt;tm_hour))</div><div class='del'>-	      + (a-&gt;tm_min - b-&gt;tm_min))</div><div class='del'>-	  + (a-&gt;tm_sec - b-&gt;tm_sec));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-get_date(p, now)</div><div class='del'>-    char		*p;</div><div class='del'>-    struct timeb	*now;</div><div class='del'>-{</div><div class='del'>-    struct tm		*tm, gmt;</div><div class='del'>-    struct timeb	ftz;</div><div class='del'>-    time_t		Start;</div><div class='del'>-    time_t		tod;</div><div class='del'>-    time_t nowtime;</div><div class='del'>-</div><div class='del'>-    yyInput = p;</div><div class='del'>-    if (now == NULL) {</div><div class='del'>-        now = &amp;ftz;</div><div class='del'>-	(void)time (&amp;nowtime);</div><div class='del'>-</div><div class='del'>-	if (! (tm = gmtime (&amp;nowtime)))</div><div class='del'>-	    return -1;</div><div class='del'>-	gmt = *tm;	/* Make a copy, in case localtime modifies *tm.  */</div><div class='del'>-</div><div class='del'>-	if (! (tm = localtime (&amp;nowtime)))</div><div class='del'>-	    return -1;</div><div class='del'>-	</div><div class='del'>-	ftz.timezone = difftm (&amp;gmt, tm) / 60;</div><div class='del'>-	if(tm-&gt;tm_isdst)</div><div class='del'>-	    ftz.timezone += 60;</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-    {</div><div class='del'>-	nowtime = now-&gt;time;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    tm = localtime(&amp;nowtime);</div><div class='del'>-    yyYear = tm-&gt;tm_year;</div><div class='del'>-    yyMonth = tm-&gt;tm_mon + 1;</div><div class='del'>-    yyDay = tm-&gt;tm_mday;</div><div class='del'>-    yyTimezone = now-&gt;timezone;</div><div class='del'>-    yyDSTmode = DSTmaybe;</div><div class='del'>-    yyHour = 0;</div><div class='del'>-    yyMinutes = 0;</div><div class='del'>-    yySeconds = 0;</div><div class='del'>-    yyMeridian = MER24;</div><div class='del'>-    yyRelSeconds = 0;</div><div class='del'>-    yyRelMonth = 0;</div><div class='del'>-    yyHaveDate = 0;</div><div class='del'>-    yyHaveDay = 0;</div><div class='del'>-    yyHaveRel = 0;</div><div class='del'>-    yyHaveTime = 0;</div><div class='del'>-    yyHaveZone = 0;</div><div class='del'>-</div><div class='del'>-    if (yyparse()</div><div class='del'>-     || yyHaveTime &gt; 1 || yyHaveZone &gt; 1 || yyHaveDate &gt; 1 || yyHaveDay &gt; 1)</div><div class='del'>-	return -1;</div><div class='del'>-</div><div class='del'>-    if (yyHaveDate || yyHaveTime || yyHaveDay) {</div><div class='del'>-	Start = Convert(yyMonth, yyDay, yyYear, yyHour, yyMinutes, yySeconds,</div><div class='del'>-		    yyMeridian, yyDSTmode);</div><div class='del'>-	if (Start &lt; 0)</div><div class='del'>-	    return -1;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-	Start = nowtime;</div><div class='del'>-	if (!yyHaveRel)</div><div class='del'>-	    Start -= ((tm-&gt;tm_hour * 60L + tm-&gt;tm_min) * 60L) + tm-&gt;tm_sec;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    Start += yyRelSeconds;</div><div class='del'>-    Start += RelativeMonth(Start, yyRelMonth);</div><div class='del'>-</div><div class='del'>-    if (yyHaveDay &amp;&amp; !yyHaveDate) {</div><div class='del'>-	tod = RelativeDate(Start, yyDayOrdinal, yyDayNumber);</div><div class='del'>-	Start += tod;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Have to do *something* with a legitimate -1 so it's distinguishable</div><div class='del'>-     * from the error return value.  (Alternately could set errno on error.) */</div><div class='del'>-    return Start == -1 ? 0 : Start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if	defined(TEST)</div><div class='del'>-</div><div class='del'>-/* ARGSUSED */</div><div class='del'>-int</div><div class='del'>-main(ac, av)</div><div class='del'>-    int		ac;</div><div class='del'>-    char	*av[];</div><div class='del'>-{</div><div class='del'>-    char	buff[128];</div><div class='del'>-    time_t	d;</div><div class='del'>-</div><div class='del'>-    (void)printf("Enter date, or blank line to exit.\n\t&gt; ");</div><div class='del'>-    (void)fflush(stdout);</div><div class='del'>-    while (gets(buff) &amp;&amp; buff[0]) {</div><div class='del'>-	d = get_date(buff, (struct timeb *)NULL);</div><div class='del'>-	if (d == -1)</div><div class='del'>-	    (void)printf("Bad format - couldn't convert.\n");</div><div class='del'>-	else</div><div class='del'>-	    (void)printf("%s", ctime(&amp;d));</div><div class='del'>-	(void)printf("\t&gt; ");</div><div class='del'>-	(void)fflush(stdout);</div><div class='del'>-    }</div><div class='del'>-    exit(0);</div><div class='del'>-    /* NOTREACHED */</div><div class='del'>-}</div><div class='del'>-#endif	/* defined(TEST) */</div><div class='head'>diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c<br/>deleted file mode 100644<br/>index fb662c4b3c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gncal-todo.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gncal-todo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,903 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* To-do widget for gncal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;quartic@gimp.org&gt;</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;gnome.h&gt;</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-#include "gncal-todo.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "popup-menu.h"</div><div class='del'>-</div><div class='del'>-int todo_show_due_date = 0;</div><div class='del'>-int todo_show_priority = 0;</div><div class='del'>-int todo_show_time_remaining = 0;</div><div class='del'>-</div><div class='del'>-int todo_item_dstatus_highlight_overdue = 0;</div><div class='del'>-int todo_item_dstatus_highlight_due_today = 0;</div><div class='del'>-int todo_item_dstatus_highlight_not_due_yet = 0;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *todo_overdue_font_text;</div><div class='del'>-gint todo_current_sort_column = 0;</div><div class='del'>-gint todo_current_sort_type = GTK_SORT_ASCENDING;</div><div class='del'>-</div><div class='del'>-gboolean todo_style_changed =0;</div><div class='del'>-gboolean todo_list_autoresize = 1;</div><div class='del'>-gboolean todo_list_redraw_in_progess = 0;</div><div class='del'>-static void gncal_todo_init (GncalTodo *todo);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-gncal_todo_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint todo_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!todo_type) {</div><div class='del'>-		GtkTypeInfo todo_info = {</div><div class='del'>-			"GncalTodo",</div><div class='del'>-			sizeof (GncalTodo),</div><div class='del'>-			sizeof (GncalTodoClass),</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-			(GtkObjectInitFunc) gncal_todo_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_type = gtk_type_unique (gtk_vbox_get_type (), &amp;todo_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return todo_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ok_button (GtkWidget *widget, GnomeDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	GncalTodo *todo;</div><div class='del'>-	GtkEntry *entry;</div><div class='del'>-	GnomeDateEdit *due_date;</div><div class='del'>-	GtkText *comment;</div><div class='del'>-	GtkSpinButton *priority;</div><div class='del'>-</div><div class='del'>-	ico = gtk_object_get_user_data (GTK_OBJECT (dialog));</div><div class='del'>-</div><div class='del'>-	todo = GNCAL_TODO (gtk_object_get_data (GTK_OBJECT (dialog), "gncal_todo"));</div><div class='del'>-	entry = GTK_ENTRY (gtk_object_get_data (GTK_OBJECT (dialog), "summary_entry"));</div><div class='del'>-	due_date = GNOME_DATE_EDIT (gtk_object_get_data(GTK_OBJECT(dialog), "due_date"));</div><div class='del'>-	priority = GTK_SPIN_BUTTON (gtk_object_get_data(GTK_OBJECT(dialog), "priority"));</div><div class='del'>-	comment = GTK_TEXT(gtk_object_get_data (GTK_OBJECT(dialog), "comment"));</div><div class='del'>-	if (ico-&gt;summary)</div><div class='del'>-	  g_free (ico-&gt;summary);</div><div class='del'>-	if (ico-&gt;comment)</div><div class='del'>-	  g_free (ico-&gt;comment);</div><div class='del'>-	ico-&gt;dtend = gnome_date_edit_get_date (due_date);</div><div class='del'>-	ico-&gt;summary = g_strdup (gtk_entry_get_text (entry));</div><div class='del'>-	ico-&gt;priority = gtk_spin_button_get_value_as_int (priority);</div><div class='del'>-	ico-&gt;comment = gtk_editable_get_chars( GTK_EDITABLE(comment), 0, -1);</div><div class='del'>-	ico-&gt;user_data = NULL;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (todo-&gt;calendar-&gt;client, ico))</div><div class='del'>-		g_message ("ok_button(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel_button (GtkWidget *widget, GnomeDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = gtk_object_get_user_data (GTK_OBJECT (dialog));</div><div class='del'>-</div><div class='del'>-	ico-&gt;user_data = NULL;</div><div class='del'>-</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (dialog));</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'>-delete_event (GtkWidget *widget, GdkEvent *event, GnomeDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	cancel_button (NULL, dialog);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_todo_editor (GncalTodo *todo, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *due_box;</div><div class='del'>-	GtkWidget *due_label;</div><div class='del'>-	GtkWidget *due_entry;</div><div class='del'>-	GtkWidget *comment_box;</div><div class='del'>-	GtkWidget *comment_label;</div><div class='del'>-	GtkWidget *comment_text;</div><div class='del'>-	GtkWidget *comment_internal_box;</div><div class='del'>-	GtkWidget *comment_sep;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GtkWidget *pri_box;</div><div class='del'>-	GtkWidget *pri_label;</div><div class='del'>-	GtkWidget *pri_spin;</div><div class='del'>-	GtkObject *pri_adj;</div><div class='del'>-</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_dialog_new (ico-&gt;new ? _("Create to-do item") : _("Edit to-do item"),</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_parent (GNOME_DIALOG (dialog),</div><div class='del'>-	  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (todo-&gt;calendar))));</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 4);</div><div class='del'>-	gtk_container_border_width (GTK_CONTAINER (hbox), 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox),</div><div class='del'>-			    hbox, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	due_box = gtk_hbox_new (FALSE, 4);</div><div class='del'>-	gtk_container_border_width (GTK_CONTAINER (due_box), 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), due_box, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (due_box);</div><div class='del'>-</div><div class='del'>-	pri_box = gtk_hbox_new (FALSE, 4);</div><div class='del'>-	gtk_container_border_width (GTK_CONTAINER (pri_box), 4);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), pri_box, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (pri_box);</div><div class='del'>-	</div><div class='del'>-	comment_box = gtk_hbox_new (FALSE, 4);</div><div class='del'>-	gtk_container_border_width (GTK_CONTAINER (comment_box), 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), comment_box, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (comment_box);</div><div class='del'>-</div><div class='del'>-	comment_internal_box = gtk_vbox_new(FALSE,2);</div><div class='del'>-	gtk_container_border_width (GTK_CONTAINER (comment_internal_box), 4);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (comment_box), comment_internal_box, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (comment_internal_box);</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("Summary:"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	entry = gtk_entry_new ();</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (entry), ico-&gt;summary);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (entry);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	due_label = gtk_label_new (_("Due Date:"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (due_box), due_label, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (due_label);</div><div class='del'>-</div><div class='del'>-	due_entry = gtk_entry_new ();</div><div class='del'>-	due_entry = date_edit_new (ico-&gt;dtend, TRUE);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (due_box), due_entry, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (due_entry);</div><div class='del'>-</div><div class='del'>-	pri_label = gtk_label_new (_("Priority:"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pri_box), pri_label, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (pri_label);</div><div class='del'>-</div><div class='del'>-	pri_adj = gtk_adjustment_new (5.0, 1.0, 9.0, 1.0, 3.0, 0.0);</div><div class='del'>-	pri_spin = gtk_spin_button_new (GTK_ADJUSTMENT(pri_adj), 0.0, 0);</div><div class='del'>-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (pri_spin), TRUE);</div><div class='del'>-	gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (pri_spin), FALSE);</div><div class='del'>-	gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (pri_spin), FALSE);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pri_box), pri_spin, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (pri_spin);</div><div class='del'>-       </div><div class='del'>-	comment_sep = gtk_hseparator_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (comment_box), comment_sep, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show(comment_sep);</div><div class='del'>-</div><div class='del'>-	comment_label = gtk_label_new (_("Item Comments:"));</div><div class='del'>-	gtk_label_set_justify(GTK_LABEL(comment_label), GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (comment_internal_box), comment_label, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (comment_label);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	comment_text = gtk_text_new (NULL, NULL);</div><div class='del'>-	gtk_text_set_editable (GTK_TEXT (comment_text), TRUE);</div><div class='del'>-	gtk_text_set_word_wrap( GTK_TEXT(comment_text), TRUE);</div><div class='del'>-	gtk_text_freeze(GTK_TEXT(comment_text));</div><div class='del'>-	if(ico-&gt;comment) {</div><div class='del'>-	  gtk_text_insert(GTK_TEXT(comment_text), NULL, NULL, NULL, ico-&gt;comment, strlen(ico-&gt;comment));</div><div class='del'>-	}</div><div class='del'>-	gtk_text_thaw(GTK_TEXT(comment_text));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (comment_internal_box), comment_text, FALSE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (comment_text);</div><div class='del'>-</div><div class='del'>-	ico-&gt;user_data = dialog;</div><div class='del'>-</div><div class='del'>-	gtk_object_set_user_data (GTK_OBJECT (dialog), ico);</div><div class='del'>-	ical_object_ref (ico);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (dialog), "gncal_todo", todo);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (dialog), "summary_entry", entry);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (dialog), "due_date", due_entry);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (dialog), "priority", pri_spin);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (dialog), "comment", comment_text);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, (GtkSignalFunc) ok_button, dialog);</div><div class='del'>-	gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, (GtkSignalFunc) cancel_button, dialog);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",</div><div class='del'>-			    (GtkSignalFunc) delete_event,</div><div class='del'>-			    dialog);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE(entry));</div><div class='del'>-</div><div class='del'>-	gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-	gtk_widget_grab_focus (entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static iCalObject *</div><div class='del'>-get_clist_selected_ico (GtkCList *clist)</div><div class='del'>-{</div><div class='del'>-	gint sel;</div><div class='del'>-</div><div class='del'>-	if (!clist-&gt;selection)</div><div class='del'>-		return NULL;</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'>-	return gtk_clist_get_row_data (clist, sel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_todo (GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = ical_new ("", user_name, "");</div><div class='del'>-	ico-&gt;type = ICAL_TODO;</div><div class='del'>-	ico-&gt;new = TRUE;</div><div class='del'>-</div><div class='del'>-	simple_todo_editor (todo, ico);</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_todo (GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	simple_todo_editor (todo, get_clist_selected_ico (todo-&gt;clist));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_todo (GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	if (!cal_client_remove_object (todo-&gt;calendar-&gt;client,</div><div class='del'>-				       get_clist_selected_ico (todo-&gt;clist)-&gt;uid))</div><div class='del'>-		g_message ("delete_todo(): Could not remove the object!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_activated (GtkWidget *widget, GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	while ((w = gtk_grab_get_current ()) != NULL)</div><div class='del'>-		gtk_grab_remove (w);</div><div class='del'>-	</div><div class='del'>-	add_todo (todo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_activated (GtkWidget *widget, GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	while ((w = gtk_grab_get_current ()) != NULL)</div><div class='del'>-		gtk_grab_remove (w);</div><div class='del'>-	</div><div class='del'>-	edit_todo (todo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_activated (GtkWidget *widget, GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	delete_todo (todo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *event, GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	static struct menu_item items[] = {</div><div class='del'>-		{ N_("Add to-do item..."), (GtkSignalFunc) add_activated, NULL, TRUE },</div><div class='del'>-		{ N_("Edit this item..."), (GtkSignalFunc) edit_activated, NULL, TRUE },</div><div class='del'>-		{ N_("Delete this item"), (GtkSignalFunc) delete_activated, NULL, TRUE }</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (todo-&gt;edit_button, (todo-&gt;clist-&gt;selection != NULL));</div><div class='del'>-	gtk_widget_set_sensitive (todo-&gt;delete_button, (todo-&gt;clist-&gt;selection != NULL));</div><div class='del'>-</div><div class='del'>-	if (!event)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;button) {</div><div class='del'>-	case 1:</div><div class='del'>-		if (event-&gt;type == GDK_2BUTTON_PRESS)</div><div class='del'>-			edit_todo (todo);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 3:</div><div class='del'>-		for (i = 0; i &lt; (sizeof (items) / sizeof (items[0])); i++)</div><div class='del'>-			items[i].data = todo;</div><div class='del'>-</div><div class='del'>-		popup_menu (items, sizeof (items) / sizeof (items[0]), 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'>- * once we get a call back stating that a column</div><div class='del'>- * has been resized never ever automatically resize again</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-column_resized (GtkWidget *widget, GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	/* disabling autoresize of columns */</div><div class='del'>-	if (todo_list_autoresize &amp;&amp; !todo_list_redraw_in_progess){</div><div class='del'>-		todo_list_autoresize = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * restore the previously set settings for sorting the </div><div class='del'>- * todo list</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-init_column_sorting (GtkCList *clist)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* due date isn't shown so we can't sort by it */</div><div class='del'>-	if (todo_current_sort_column == 1 &amp;&amp; ! todo_show_due_date) </div><div class='del'>-		todo_current_sort_column = 0;</div><div class='del'>-	</div><div class='del'>-	clist-&gt;sort_type = todo_current_sort_type;</div><div class='del'>-	clist-&gt;sort_column = todo_current_sort_column;</div><div class='del'>-	</div><div class='del'>-	gtk_clist_set_sort_column (clist, todo_current_sort_column);</div><div class='del'>-	gtk_clist_sort (clist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-todo_click_column (GtkCList *clist, gint column, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (column == clist-&gt;sort_column)</div><div class='del'>-	{</div><div class='del'>-		if (clist-&gt;sort_type == GTK_SORT_ASCENDING) {</div><div class='del'>-			clist-&gt;sort_type = GTK_SORT_DESCENDING;</div><div class='del'>-			todo_current_sort_type = GTK_SORT_DESCENDING;</div><div class='del'>-		} else {</div><div class='del'>-			clist-&gt;sort_type = GTK_SORT_ASCENDING;</div><div class='del'>-			todo_current_sort_type = GTK_SORT_ASCENDING;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		gtk_clist_set_sort_column (clist, column);</div><div class='del'>-		todo_current_sort_column = column;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_clist_sort (clist); </div><div class='del'>-  </div><div class='del'>-	/*</div><div class='del'>-	 * save the sorting preferences cause I hate to have the user</div><div class='del'>-	 * click twice</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gnome_config_set_int("/calendar/Todo/sort_column", todo_current_sort_column);</div><div class='del'>-	gnome_config_set_int("/calendar/Todo/sort_type", todo_current_sort_type);</div><div class='del'>-	gnome_config_sync();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gncal_todo_init (GncalTodo *todo)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GtkWidget *sw;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	gchar *titles[4] = {</div><div class='del'>-	    N_("Summary"),</div><div class='del'>-	    N_("Due Date"),</div><div class='del'>-	    N_("Priority"),</div><div class='del'>-	    N_("Time Left")</div><div class='del'>-	};</div><div class='del'>-	char *tmp[4];</div><div class='del'>-	tmp[0] = _(titles[0]);</div><div class='del'>-	tmp[1] = _(titles[1]);</div><div class='del'>-	tmp[2] = _(titles[2]);</div><div class='del'>-	tmp[3] = _(titles[3]);</div><div class='del'>-</div><div class='del'>-	gtk_box_set_spacing (GTK_BOX (todo), 4);</div><div class='del'>-</div><div class='del'>-	/* Label */</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("To-do list"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (todo), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Clist */</div><div class='del'>-</div><div class='del'>-	sw = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (todo), sw, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (sw);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	w = gtk_clist_new_with_titles(4, tmp);</div><div class='del'>-</div><div class='del'>-	todo-&gt;clist = GTK_CLIST (w);</div><div class='del'>-	gtk_clist_set_selection_mode (todo-&gt;clist, GTK_SELECTION_BROWSE);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (todo-&gt;clist), "select_row",</div><div class='del'>-			    (GtkSignalFunc) clist_row_selected,</div><div class='del'>-			    todo);</div><div class='del'>-	gtk_clist_set_button_actions (todo-&gt;clist, 2, GTK_BUTTON_SELECTS);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (todo-&gt;clist), "resize_column",</div><div class='del'>-			    (GtkSignalFunc) column_resized,</div><div class='del'>-			    todo);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (todo-&gt;clist), "click_column",</div><div class='del'>-			  (GtkSignalFunc) todo_click_column, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (sw), w);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Box for buttons */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (TRUE, 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (todo), hbox, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-	/* Add */</div><div class='del'>-</div><div class='del'>-	w = gtk_button_new_with_label (_("Add..."));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "clicked",</div><div class='del'>-			    (GtkSignalFunc) add_activated,</div><div class='del'>-			    todo);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Edit */</div><div class='del'>-</div><div class='del'>-	w = gtk_button_new_with_label (_("Edit..."));</div><div class='del'>-	todo-&gt;edit_button = w;</div><div class='del'>-	gtk_widget_set_sensitive (w, FALSE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "clicked",</div><div class='del'>-			    (GtkSignalFunc) edit_activated,</div><div class='del'>-			    todo);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Delete */</div><div class='del'>-</div><div class='del'>-	w = gtk_button_new_with_label (_("Delete"));</div><div class='del'>-	todo-&gt;delete_button = w;</div><div class='del'>-	gtk_widget_set_sensitive (w, FALSE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "clicked",</div><div class='del'>-			    (GtkSignalFunc) delete_activated,</div><div class='del'>-			    todo);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-gncal_todo_new (GnomeCalendar *calendar)</div><div class='del'>-{</div><div class='del'>-	GncalTodo *todo;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (calendar != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	todo = gtk_type_new (gncal_todo_get_type ());</div><div class='del'>-</div><div class='del'>-	todo-&gt;calendar = calendar;</div><div class='del'>-</div><div class='del'>-	gncal_todo_update (todo, NULL, 0);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (todo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-convert_time_t_to_char (time_t t)</div><div class='del'>-{</div><div class='del'>-	char buf[100];</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-	strftime(buf, sizeof (buf), "%m/%d/%Y", &amp;tm);</div><div class='del'>-</div><div class='del'>-	return g_strdup (buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum todo_styles {</div><div class='del'>-	TODO_STYLE_OVERDUE,</div><div class='del'>-	TODO_STYLE_DUE_TODAY,</div><div class='del'>-	TODO_STYLE_NOT_DUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum todo_status {</div><div class='del'>-	TODO_ITEM_DSTATUS_NOT_DUE_YET,</div><div class='del'>-	TODO_ITEM_DSTATUS_DUE_TODAY,</div><div class='del'>-	TODO_ITEM_DSTATUS_OVERDUE,</div><div class='del'>-	TODO_ITEM_DSTATUS_LAST_DUE_STATUS</div><div class='del'>-};</div><div class='del'>-typedef enum todo_status todo_status;</div><div class='del'>-</div><div class='del'>-static GtkStyle *</div><div class='del'>-make_todo_style(GncalTodo *todo, todo_status style_type) </div><div class='del'>-{</div><div class='del'>-	GtkStyle *style = NULL;</div><div class='del'>-	GdkColor style_color;</div><div class='del'>-	int color_prop = 0;</div><div class='del'>-	switch(style_type) {</div><div class='del'>-	case TODO_ITEM_DSTATUS_NOT_DUE_YET:</div><div class='del'>-	  color_prop = COLOR_PROP_TODO_NOT_DUE_YET;</div><div class='del'>-	  break;</div><div class='del'>-	case TODO_ITEM_DSTATUS_DUE_TODAY:</div><div class='del'>-	  color_prop = COLOR_PROP_TODO_DUE_TODAY;</div><div class='del'>-	  break;</div><div class='del'>-	case TODO_ITEM_DSTATUS_OVERDUE:</div><div class='del'>-	  color_prop = COLOR_PROP_TODO_OVERDUE;</div><div class='del'>-	  break;</div><div class='del'>-	case TODO_ITEM_DSTATUS_LAST_DUE_STATUS:</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	style_color.red   = color_props[color_prop].r;</div><div class='del'>-	style_color.green = color_props[color_prop].g;</div><div class='del'>-	style_color.blue  = color_props[color_prop].b;</div><div class='del'>-	</div><div class='del'>-	style = gtk_style_copy (GTK_WIDGET (todo-&gt;clist)-&gt;style);</div><div class='del'>-	style-&gt;base[GTK_STATE_NORMAL] = style_color;</div><div class='del'>-	return style;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-todo_status todo_item_due_status(time_t *todo_due_time) {</div><div class='del'>-	struct tm due_tm_time;</div><div class='del'>-	struct tm current_time;</div><div class='del'>-	struct tm *temp_tm;</div><div class='del'>-	time_t current_time_val = time(NULL);</div><div class='del'>-	temp_tm = localtime(todo_due_time);</div><div class='del'>-	/* make a copy so it dosen't get over written */</div><div class='del'>-	memcpy(&amp;due_tm_time, temp_tm, sizeof(struct tm));</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	temp_tm = localtime(&amp;current_time_val);</div><div class='del'>-	memcpy(&amp;current_time, temp_tm, sizeof(struct tm));</div><div class='del'>-	</div><div class='del'>-	if(due_tm_time.tm_mon == current_time.tm_mon &amp;&amp;</div><div class='del'>-	   due_tm_time.tm_mday == current_time.tm_mday &amp;&amp;</div><div class='del'>-	   due_tm_time.tm_year == current_time.tm_year) {</div><div class='del'>-		return TODO_ITEM_DSTATUS_DUE_TODAY;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if((*todo_due_time) &lt; current_time_val) {</div><div class='del'>-		return TODO_ITEM_DSTATUS_OVERDUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TODO_ITEM_DSTATUS_NOT_DUE_YET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum todo_remaining_time_form {</div><div class='del'>-	TODO_ITEM_REMAINING_WEEKS,</div><div class='del'>-	TODO_ITEM_REMAINING_DAYS,</div><div class='del'>-	TODO_ITEM_REMAINING_HOURS,</div><div class='del'>-	TODO_ITEM_REMAINING_MINUTES,</div><div class='del'>-	TODO_ITEM_REMAINING_SECONDS</div><div class='del'>-};</div><div class='del'>-typedef enum todo_remaining_time_form todo_remaining_time_form;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_in_clist (GncalTodo *todo, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *text[4];</div><div class='del'>-	char time_remaining_buffer[100];</div><div class='del'>-	time_t time_remain;</div><div class='del'>-	todo_remaining_time_form time_remaining_form;</div><div class='del'>-	int sec_in_week = 3600*7*24;</div><div class='del'>-	int sec_in_day = 3600*24;</div><div class='del'>-	int sec_in_hour = 3600;</div><div class='del'>-	int sec_in_minute = 60;</div><div class='del'>-	int weeks = 0;</div><div class='del'>-	int days = 0;</div><div class='del'>-	int hours = 0;</div><div class='del'>-	int minutes = 0;</div><div class='del'>-	int seconds = 0; </div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* an array for the styles of items */</div><div class='del'>-	static GtkStyle *dstatus_styles[TODO_ITEM_DSTATUS_LAST_DUE_STATUS];</div><div class='del'>-	/* we want to remake the styles when the status is changed,</div><div class='del'>-	   also we need to check for the null value in the pointer so we init them</div><div class='del'>-	   at startup */</div><div class='del'>-	if (todo_style_changed || !dstatus_styles[TODO_ITEM_DSTATUS_NOT_DUE_YET]) {</div><div class='del'>-		g_free(dstatus_styles[TODO_ITEM_DSTATUS_NOT_DUE_YET]);</div><div class='del'>-		g_free(dstatus_styles[TODO_ITEM_DSTATUS_OVERDUE]);</div><div class='del'>-		g_free(dstatus_styles[TODO_ITEM_DSTATUS_DUE_TODAY]);</div><div class='del'>-		</div><div class='del'>-		dstatus_styles[TODO_ITEM_DSTATUS_NOT_DUE_YET] = make_todo_style(todo, TODO_ITEM_DSTATUS_NOT_DUE_YET);</div><div class='del'>-		dstatus_styles[TODO_ITEM_DSTATUS_OVERDUE] = make_todo_style(todo, TODO_ITEM_DSTATUS_OVERDUE);</div><div class='del'>-		dstatus_styles[TODO_ITEM_DSTATUS_DUE_TODAY] = make_todo_style(todo, TODO_ITEM_DSTATUS_DUE_TODAY);</div><div class='del'>-		</div><div class='del'>-		todo_style_changed = 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'>-</div><div class='del'>-	text[0] =  ico-&gt;summary;</div><div class='del'>-</div><div class='del'>-	if(todo_show_time_remaining) {</div><div class='del'>-	  memset(time_remaining_buffer, 0, 100);</div><div class='del'>-	  /* we need to make a string that represents the amount of time remaining</div><div class='del'>-	     before this task is due */</div><div class='del'>-	  </div><div class='del'>-	  /* for right now all I'll do is up to the hours. */</div><div class='del'>-	  time_remain = (ico-&gt;dtend - time(NULL));</div><div class='del'>-	  if(time_remain &lt; 0) {</div><div class='del'>-	    text[3] = "Overdue!";</div><div class='del'>-	  }</div><div class='del'>-	  else {</div><div class='del'>-</div><div class='del'>-	    /* lets determine a decent denomination to display */</div><div class='del'>-	    if(time_remain / (sec_in_week)) </div><div class='del'>-	      {</div><div class='del'>-	    	/* we have weeks available */</div><div class='del'>-	    	time_remaining_form = TODO_ITEM_REMAINING_WEEKS;</div><div class='del'>-		weeks = time_remain / sec_in_week;</div><div class='del'>-		days = (time_remain % (sec_in_week))/sec_in_day;</div><div class='del'>-	      }</div><div class='del'>-	    else if(time_remain / (sec_in_day)) </div><div class='del'>-	      {</div><div class='del'>-		/* we have days available */</div><div class='del'>-	    	time_remaining_form = TODO_ITEM_REMAINING_DAYS;</div><div class='del'>-		days = time_remain / sec_in_day;</div><div class='del'>-		hours = (time_remain % sec_in_day)/sec_in_hour;</div><div class='del'>-	      }</div><div class='del'>-	    else if(time_remain / (sec_in_hour)) </div><div class='del'>-	      {</div><div class='del'>-		/* we have hours available */</div><div class='del'>-	    	time_remaining_form = TODO_ITEM_REMAINING_HOURS;</div><div class='del'>-		hours = time_remain /sec_in_hour;</div><div class='del'>-		minutes = (time_remain % sec_in_hour) / sec_in_minute;</div><div class='del'>-	      }</div><div class='del'>-	    else if(time_remain / sec_in_minute) </div><div class='del'>-	      {</div><div class='del'>-	    	time_remaining_form = TODO_ITEM_REMAINING_MINUTES;</div><div class='del'>-		minutes = time_remain / sec_in_minute;</div><div class='del'>-		seconds = time_remain % sec_in_minute;</div><div class='del'>-	      }</div><div class='del'>-	    else </div><div class='del'>-	      {</div><div class='del'>-	    	time_remaining_form = TODO_ITEM_REMAINING_SECONDS;</div><div class='del'>-		seconds = time_remain;</div><div class='del'>-	      }</div><div class='del'>-</div><div class='del'>-	    switch(time_remaining_form) </div><div class='del'>-	      {</div><div class='del'>-	      case TODO_ITEM_REMAINING_WEEKS:</div><div class='del'>-		snprintf(time_remaining_buffer, 100, "%d %s %d %s", weeks,</div><div class='del'>-			 (weeks &gt; 1) ? _("Weeks") : _("Week"),</div><div class='del'>-			 days, (days &gt; 1) ? _("Days") : _("Day"));</div><div class='del'>-		break;</div><div class='del'>-	      case TODO_ITEM_REMAINING_DAYS:</div><div class='del'>-		snprintf(time_remaining_buffer, 100, "%d %s %d %s", days,</div><div class='del'>-			 (days &gt; 1) ? _("Days") : _("Day"),</div><div class='del'>-			 hours, (hours &gt; 1) ? _("Hours") : _("Hour"));</div><div class='del'>-		break;</div><div class='del'>-	      case TODO_ITEM_REMAINING_HOURS:</div><div class='del'>-		snprintf(time_remaining_buffer, 100, "%d %s %d %s", hours,</div><div class='del'>-			 (hours &gt; 1) ? _("Hours") : _("Hour"),</div><div class='del'>-			 minutes, (minutes &gt; 1) ? _("Minutes") : _("Minute"));</div><div class='del'>-		break;</div><div class='del'>-	      case TODO_ITEM_REMAINING_MINUTES:</div><div class='del'>-		snprintf(time_remaining_buffer, 100, "%d %s %d %s", minutes,</div><div class='del'>-			 (minutes &gt; 1) ? _("Minutes") : _("Minute"),</div><div class='del'>-			 seconds, (seconds &gt; 1) ? _("Seconds") : _("Second"));</div><div class='del'>-		break;</div><div class='del'>-	      case TODO_ITEM_REMAINING_SECONDS:</div><div class='del'>-		snprintf(time_remaining_buffer, 100, "%d %s", seconds,</div><div class='del'>-			 (seconds &gt; 1) ? _("Seconds") : _("Second")); </div><div class='del'>-		break;</div><div class='del'>-	      }</div><div class='del'>-	    text[3] = g_strdup(time_remaining_buffer);</div><div class='del'>-	    todo-&gt;data_ptrs = g_slist_append(todo-&gt;data_ptrs, text[3]);</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-	  text[3] = "Loose penguini!";</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * right now column 0 will be the summary</div><div class='del'>-	 * and column 1 will be the due date. </div><div class='del'>-	 * WISH:  this should be able to be changed on the fly</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if(ico-&gt;dtend &amp;&amp; todo_show_due_date)</div><div class='del'>-	  {</div><div class='del'>-	    text[1] = convert_time_t_to_char (ico-&gt;dtend);</div><div class='del'>-	    /* Append the data's pointer so later it can be properly freed */</div><div class='del'>-	    todo-&gt;data_ptrs = g_slist_append (todo-&gt;data_ptrs, text[1]);</div><div class='del'>-	  }</div><div class='del'>-	else</div><div class='del'>-		text[1] = NULL;</div><div class='del'>-	</div><div class='del'>-	if(ico-&gt;priority &amp;&amp; todo_show_priority)</div><div class='del'>-	  {</div><div class='del'>-	    text[2] = g_strdup_printf ("%d", ico-&gt;priority);</div><div class='del'>-	    todo-&gt;data_ptrs = g_slist_append (todo-&gt;data_ptrs, text[2]);</div><div class='del'>-	  }</div><div class='del'>-	else</div><div class='del'>-	  text[2] = NULL;</div><div class='del'>-</div><div class='del'>-	i = gtk_clist_append (todo-&gt;clist, text);</div><div class='del'>-	</div><div class='del'>-	gtk_clist_set_row_data_full (todo-&gt;clist, i, ico,</div><div class='del'>-				     (GtkDestroyNotify) ical_object_unref);</div><div class='del'>-	ical_object_ref (ico);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * determine if the task is overdue..</div><div class='del'>-	 * if so mark with the apropriate style</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch(todo_item_due_status(&amp;ico-&gt;dtend)) {</div><div class='del'>-	case TODO_ITEM_DSTATUS_NOT_DUE_YET:</div><div class='del'>-	  if(todo_item_dstatus_highlight_not_due_yet) </div><div class='del'>-	    {</div><div class='del'>-	      gtk_clist_set_row_style(todo-&gt;clist, i, dstatus_styles[TODO_ITEM_DSTATUS_NOT_DUE_YET]);</div><div class='del'>-	    }</div><div class='del'>-	  break;</div><div class='del'>-	case TODO_ITEM_DSTATUS_DUE_TODAY:</div><div class='del'>-	  if(todo_item_dstatus_highlight_due_today)</div><div class='del'>-	    {</div><div class='del'>-	      gtk_clist_set_row_style(todo-&gt;clist, i, dstatus_styles[TODO_ITEM_DSTATUS_DUE_TODAY]);</div><div class='del'>-	    }</div><div class='del'>-	  break;</div><div class='del'>-	case TODO_ITEM_DSTATUS_OVERDUE:</div><div class='del'>-	  if(todo_item_dstatus_highlight_overdue) </div><div class='del'>-	    {</div><div class='del'>-	      gtk_clist_set_row_style(todo-&gt;clist, i, dstatus_styles[TODO_ITEM_DSTATUS_OVERDUE]);</div><div class='del'>-	    }</div><div class='del'>-	  break;</div><div class='del'>-	case TODO_ITEM_DSTATUS_LAST_DUE_STATUS:</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* keep the list in order */</div><div class='del'>-	gtk_clist_sort (todo-&gt;clist); </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gncal_todo_update (GncalTodo *todo, iCalObject *ico, int flags)</div><div class='del'>-{</div><div class='del'>-	GSList *current_list;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	GList *l, *uids;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (todo != NULL);</div><div class='del'>-	g_return_if_fail (GNCAL_IS_TODO (todo));</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * shut down the resize handler cause we are playing with the list. </div><div class='del'>-	 * In otherwords turn off the event handler</div><div class='del'>-	 */</div><div class='del'>-	todo_list_redraw_in_progess =1;</div><div class='del'>-	</div><div class='del'>-	/* freeze the list */</div><div class='del'>-	gtk_clist_freeze (todo-&gt;clist);</div><div class='del'>-	init_column_sorting (todo-&gt;clist);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * before here we have to free some of the memory that</div><div class='del'>-	 * stores the due date, or else we have a memory leak. </div><div class='del'>-	 * luckily all of the pointers are stored in todo-&gt;data_ptrs;</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* check on the columns that we should display */</div><div class='del'>-	/* check for due date */</div><div class='del'>-</div><div class='del'>-	if(todo_show_due_date) {</div><div class='del'>-	  gtk_clist_set_column_visibility (todo-&gt;clist, 1, 1);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-	  gtk_clist_set_column_visibility (todo-&gt;clist, 1, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(todo_show_time_remaining) {</div><div class='del'>-	  gtk_clist_set_column_visibility (todo-&gt;clist, 3, 1);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-	  gtk_clist_set_column_visibility (todo-&gt;clist, 3, 0);</div><div class='del'>-	}</div><div class='del'>-				       </div><div class='del'>-</div><div class='del'>-	if(todo_show_priority)</div><div class='del'>-	  gtk_clist_set_column_visibility (todo-&gt;clist, 2, 1);</div><div class='del'>-	else</div><div class='del'>-	  gtk_clist_set_column_visibility (todo-&gt;clist, 2, 0);</div><div class='del'>-	</div><div class='del'>-	/* free the memory locations that were used in the previous display */</div><div class='del'>-	for (current_list = todo-&gt;data_ptrs;</div><div class='del'>-	     current_list != NULL;</div><div class='del'>-	     current_list = g_slist_next(current_list)){</div><div class='del'>-		g_free(current_list-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* free the list and clear out the pointer */</div><div class='del'>-	g_slist_free(todo-&gt;data_ptrs);</div><div class='del'>-	todo-&gt;data_ptrs = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_clist_clear (todo-&gt;clist);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_uids (todo-&gt;calendar-&gt;client,</div><div class='del'>-				    CALOBJ_TYPE_TODO);</div><div class='del'>-	for (l = uids; l; l = l-&gt;next){</div><div class='del'>-		char *uid = l-&gt;data;</div><div class='del'>-		iCalObject *obj;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_object (todo-&gt;calendar-&gt;client, uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-		if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-			insert_in_clist (todo, obj);</div><div class='del'>-			ical_object_unref (obj);</div><div class='del'>-		}</div><div class='del'>-#warning "FIX ME"</div><div class='del'>-		/* else? */</div><div class='del'>-		g_free (uid);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (uids);</div><div class='del'>-</div><div class='del'>-	/* if we are autoresizing then do it now */</div><div class='del'>-	if(todo_list_autoresize &amp;&amp; todo-&gt;clist-&gt;rows != 0) </div><div class='del'>-		gtk_clist_columns_autosize (todo-&gt;clist);</div><div class='del'>-</div><div class='del'>-	gtk_clist_thaw (todo-&gt;clist);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_set_sensitive (todo-&gt;edit_button,</div><div class='del'>-				  (todo-&gt;clist-&gt;selection != NULL));</div><div class='del'>-	gtk_widget_set_sensitive (todo-&gt;delete_button,</div><div class='del'>-				  (todo-&gt;clist-&gt;selection != NULL));</div><div class='del'>-	todo_list_redraw_in_progess = 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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/gncal-todo.h b/calendar/gui/gncal-todo.h<br/>deleted file mode 100644<br/>index 51cfadea3f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gncal-todo.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gncal-todo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* To-do widget for gncal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;quartic@gimp.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef GNCAL_TODO_H</div><div class='del'>-#define GNCAL_TODO_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkclist.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GNCAL_TODO(obj)         GTK_CHECK_CAST (obj, gncal_todo_get_type (), GncalTodo)</div><div class='del'>-#define GNCAL_TODO_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gncal_todo_get_type (), GncalTodoClass)</div><div class='del'>-#define GNCAL_IS_TODO(obj)      GTK_CHECK_TYPE (obj, gncal_todo_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _GncalTodo GncalTodo;</div><div class='del'>-typedef struct _GncalTodoClass GncalTodoClass;</div><div class='del'>-</div><div class='del'>-struct _GncalTodo {</div><div class='del'>-	GtkVBox vbox;</div><div class='del'>-</div><div class='del'>-	GnomeCalendar *calendar;	/* the calendar we are associated to */</div><div class='del'>-</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-</div><div class='del'>-	GtkWidget *edit_button;</div><div class='del'>-	GtkWidget *delete_button;</div><div class='del'>-              GSList *data_ptrs;</div><div class='del'>-  </div><div class='del'>- </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _GncalTodoClass {</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-guint      gncal_todo_get_type (void);</div><div class='del'>-GtkWidget *gncal_todo_new      (GnomeCalendar *calendar);</div><div class='del'>-</div><div class='del'>-void       gncal_todo_update   (GncalTodo *todo, iCalObject *ico, int flags);</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-cal.c b/calendar/gui/gnome-cal.c<br/>deleted file mode 100644<br/>index 1e98737098..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnome-cal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1446 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * GnomeCalendar widget</div><div class='del'>- * Copyright (C) 1998 the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Miguel de Icaza (miguel@kernel.org)</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;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;widgets/e-paned/e-hpaned.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtknotebook.h&gt;</div><div class='del'>-#include &lt;gtk/gtkscrolledwindow.h&gt;</div><div class='del'>-#include &lt;widgets/e-paned/e-vpaned.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "dialogs/alarm-notify-dialog.h"</div><div class='del'>-#include "alarm.h"</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-#include "gncal-todo.h"</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* An entry in the UID-&gt;alarms hash table.  The UID key *is* the uid field in</div><div class='del'>- * this structure, so don't free it separately.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;</div><div class='del'>-	GList *alarm_ids;</div><div class='del'>-} ObjectAlarms;</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_update_view_times (GnomeCalendar *gcal,</div><div class='del'>-					      GtkWidget *page);</div><div class='del'>-static void gnome_calendar_update_gtk_calendar (GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_on_day_selected (GtkCalendar   *calendar,</div><div class='del'>-					    GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_on_month_changed (GtkCalendar   *calendar,</div><div class='del'>-					     GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-static GtkVBoxClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void setup_alarm (GnomeCalendar *cal, CalAlarmInstance *ai);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-gnome_calendar_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint gnome_calendar_type = 0;</div><div class='del'>-	if(!gnome_calendar_type) {</div><div class='del'>-		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'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		/*</div><div class='del'>-		gnome_calendar_type = gtk_type_unique(gnome_app_get_type(), &amp;gnome_calendar_info);</div><div class='del'>-		parent_class = gtk_type_class (gnome_app_get_type());</div><div class='del'>-		*/</div><div class='del'>-		gnome_calendar_type = gtk_type_unique (gtk_vbox_get_type (),</div><div class='del'>-						       &amp;gnome_calendar_info);</div><div class='del'>-		parent_class = gtk_type_class (gtk_vbox_get_type ());</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'>-	object_class-&gt;destroy = gnome_calendar_destroy;</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'>-	gcal-&gt;object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	gcal-&gt;alarms = 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 an object alarms entry */</div><div class='del'>-static void</div><div class='del'>-free_object_alarms (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ObjectAlarms *oa;</div><div class='del'>-</div><div class='del'>-	oa = value;</div><div class='del'>-</div><div class='del'>-	g_assert (oa-&gt;uid != NULL);</div><div class='del'>-	g_free (oa-&gt;uid);</div><div class='del'>-	oa-&gt;uid = NULL;</div><div class='del'>-</div><div class='del'>-	g_assert (oa-&gt;alarm_ids != NULL);</div><div class='del'>-	g_list_free (oa-&gt;alarm_ids);</div><div class='del'>-	oa-&gt;alarm_ids = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (oa);</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'>-free_uid (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'>-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'>-</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'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (gcal-&gt;client));</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (gcal-&gt;alarms, free_object_alarms, NULL);</div><div class='del'>-	g_hash_table_destroy (gcal-&gt;alarms);</div><div class='del'>-	gcal-&gt;alarms = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (gcal-&gt;object_editor_hash, free_uid, NULL);</div><div class='del'>-	g_hash_table_destroy (gcal-&gt;object_editor_hash);</div><div class='del'>-	gcal-&gt;object_editor_hash = 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 void</div><div class='del'>-setup_widgets (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vpane, *w;</div><div class='del'>-</div><div class='del'>-	/* The Main Notebook. */</div><div class='del'>-	gcal-&gt;main_notebook = gtk_notebook_new ();</div><div class='del'>-	gtk_notebook_set_show_border (GTK_NOTEBOOK (gcal-&gt;main_notebook),</div><div class='del'>-				      FALSE);</div><div class='del'>-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (gcal-&gt;main_notebook), FALSE);</div><div class='del'>-	gtk_widget_show (gcal-&gt;main_notebook);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (gcal), gcal-&gt;main_notebook,</div><div class='del'>-			    TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	/* The First Page of the Main Notebook, containing a HPaned with the</div><div class='del'>-	   Sub-Notebook on the left and the GtkCalendar and ToDo list on the</div><div class='del'>-	   right. */</div><div class='del'>-	gcal-&gt;hpane = e_hpaned_new ();</div><div class='del'>-	gtk_widget_show (gcal-&gt;hpane);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (gcal-&gt;main_notebook),</div><div class='del'>-				  gcal-&gt;hpane, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Sub-Notebook, to contain the Day, Work-Week &amp; Week views. */</div><div class='del'>-	gcal-&gt;sub_notebook = gtk_notebook_new ();</div><div class='del'>-	gtk_notebook_set_show_border (GTK_NOTEBOOK (gcal-&gt;sub_notebook),</div><div class='del'>-				      FALSE);</div><div class='del'>-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (gcal-&gt;sub_notebook), FALSE);</div><div class='del'>-	gtk_widget_show (gcal-&gt;sub_notebook);</div><div class='del'>-	e_paned_pack1 (E_PANED (gcal-&gt;hpane), gcal-&gt;sub_notebook,</div><div class='del'>-			 TRUE, TRUE);</div><div class='del'>-</div><div class='del'>-	/* The VPaned widget, to contain the GtkCalendar &amp; ToDo list. */</div><div class='del'>-	vpane = e_vpaned_new ();</div><div class='del'>-	gtk_widget_show (vpane);</div><div class='del'>-	e_paned_pack2 (E_PANED (gcal-&gt;hpane), vpane, FALSE, TRUE);</div><div class='del'>-</div><div class='del'>-	/* The GtkCalendar. */</div><div class='del'>-	w = gtk_calendar_new ();</div><div class='del'>-	gcal-&gt;gtk_calendar = GTK_CALENDAR (w);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-	e_paned_pack1 (E_PANED (vpane), w, FALSE, TRUE);</div><div class='del'>-	gcal-&gt;day_selected_id = gtk_signal_connect (GTK_OBJECT (gcal-&gt;gtk_calendar),</div><div class='del'>-						    "day_selected",</div><div class='del'>-						    (GtkSignalFunc) gnome_calendar_on_day_selected,</div><div class='del'>-						    gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal-&gt;gtk_calendar), "month_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_calendar_on_month_changed),</div><div class='del'>-			    gcal);</div><div class='del'>-</div><div class='del'>-	/* The ToDo list. */</div><div class='del'>-	gcal-&gt;todo = gncal_todo_new (gcal);</div><div class='del'>-	e_paned_pack2 (E_PANED (vpane), gcal-&gt;todo, TRUE, TRUE);</div><div class='del'>-	gtk_widget_show (gcal-&gt;todo);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* The Day View. */</div><div class='del'>-	gcal-&gt;day_view = e_day_view_new ();</div><div class='del'>-	e_day_view_set_calendar (E_DAY_VIEW (gcal-&gt;day_view), gcal);</div><div class='del'>-	gtk_widget_show (gcal-&gt;day_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (gcal-&gt;sub_notebook),</div><div class='del'>-				  gcal-&gt;day_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Work Week View. */</div><div class='del'>-	gcal-&gt;work_week_view = e_day_view_new ();</div><div class='del'>-	e_day_view_set_days_shown (E_DAY_VIEW (gcal-&gt;work_week_view), 5);</div><div class='del'>-	e_day_view_set_calendar (E_DAY_VIEW (gcal-&gt;work_week_view), gcal);</div><div class='del'>-	gtk_widget_show (gcal-&gt;work_week_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (gcal-&gt;sub_notebook),</div><div class='del'>-				  gcal-&gt;work_week_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Week View. */</div><div class='del'>-	gcal-&gt;week_view = e_week_view_new ();</div><div class='del'>-	e_week_view_set_calendar (E_WEEK_VIEW (gcal-&gt;week_view), gcal);</div><div class='del'>-	gtk_widget_show (gcal-&gt;week_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (gcal-&gt;sub_notebook),</div><div class='del'>-				  gcal-&gt;week_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Month View. */</div><div class='del'>-	gcal-&gt;month_view = e_week_view_new ();</div><div class='del'>-	e_week_view_set_calendar (E_WEEK_VIEW (gcal-&gt;month_view), gcal);</div><div class='del'>-	e_week_view_set_display_month (E_WEEK_VIEW (gcal-&gt;month_view), TRUE);</div><div class='del'>-	gtk_widget_show (gcal-&gt;month_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (gcal-&gt;main_notebook),</div><div class='del'>-				  gcal-&gt;month_view, gtk_label_new (""));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_current_page (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	page = GTK_NOTEBOOK (gcal-&gt;main_notebook)-&gt;cur_page-&gt;child;</div><div class='del'>-	if (page == gcal-&gt;hpane)</div><div class='del'>-		return GTK_NOTEBOOK (gcal-&gt;sub_notebook)-&gt;cur_page-&gt;child;</div><div class='del'>-	else</div><div class='del'>-		return page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-gnome_calendar_get_current_view_name (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, "dayview");</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), "dayview");</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == gcal-&gt;day_view)</div><div class='del'>-		return "dayview";</div><div class='del'>-	else if (page == gcal-&gt;work_week_view)</div><div class='del'>-		return "workweekview";</div><div class='del'>-	else if (page == gcal-&gt;week_view)</div><div class='del'>-		return "weekview";</div><div class='del'>-	else if (page == gcal-&gt;month_view)</div><div class='del'>-		return "monthview";</div><div class='del'>-	else</div><div class='del'>-		return "dayview";</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'>-	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'>-	gcal-&gt;selection_start_time = time_day_begin (new_time);</div><div class='del'>-	gcal-&gt;selection_end_time = time_add_day (gcal-&gt;selection_start_time,</div><div class='del'>-						 1);</div><div class='del'>-	gnome_calendar_update_view_times (gcal, NULL);</div><div class='del'>-	gnome_calendar_update_gtk_calendar (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'>-				  GtkWidget *page)</div><div class='del'>-{</div><div class='del'>-	if (page == NULL)</div><div class='del'>-		page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == gcal-&gt;day_view</div><div class='del'>-	    || page == gcal-&gt;work_week_view)</div><div class='del'>-		e_day_view_set_selected_time_range (E_DAY_VIEW (page),</div><div class='del'>-						    gcal-&gt;selection_start_time,</div><div class='del'>-						    gcal-&gt;selection_end_time);</div><div class='del'>-	else if (page == gcal-&gt;week_view</div><div class='del'>-		 || page == gcal-&gt;month_view)</div><div class='del'>-		e_week_view_set_selected_time_range (E_WEEK_VIEW (page),</div><div class='del'>-						     gcal-&gt;selection_start_time,</div><div class='del'>-						     gcal-&gt;selection_end_time);</div><div class='del'>-	else {</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'>-	GtkWidget *cp = get_current_page (gcal);</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-</div><div class='del'>-	start_time = gcal-&gt;selection_start_time;</div><div class='del'>-	end_time = gcal-&gt;selection_end_time;</div><div class='del'>-</div><div class='del'>-	if (cp == gcal-&gt;day_view) {</div><div class='del'>-		start_time = time_add_day (start_time, direction);</div><div class='del'>-		end_time = time_add_day (end_time, direction);</div><div class='del'>-	} else if (cp == gcal-&gt;work_week_view) {</div><div class='del'>-		start_time = time_add_week (start_time, direction);</div><div class='del'>-		end_time = time_add_week (end_time, direction);</div><div class='del'>-	} else if (cp == gcal-&gt;week_view) {</div><div class='del'>-		start_time = time_add_week (start_time, direction);</div><div class='del'>-		end_time = time_add_week (end_time, direction);</div><div class='del'>-	} else if (cp == gcal-&gt;month_view) {</div><div class='del'>-		start_time = time_add_month (start_time, direction);</div><div class='del'>-		end_time = time_add_month (end_time, direction);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Weee!  Where did the penguin go?");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		start_time = 0;</div><div class='del'>-		end_time = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gcal-&gt;selection_start_time = start_time;</div><div class='del'>-	gcal-&gt;selection_end_time = end_time;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_times (gcal, NULL);</div><div class='del'>-	gnome_calendar_update_gtk_calendar (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'>-	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_set_view (gcal, "dayview");</div><div class='del'>-	gnome_calendar_goto (gcal, time);</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'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets which view is currently shown. It also updates the selection time</div><div class='del'>-   of the view so it shows the appropriate days. */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_view (GnomeCalendar *gcal, char *page_name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-	int main_page = 0, sub_page = -1;</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 (page_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (strcmp (page_name, "dayview") == 0) {</div><div class='del'>-		page = gcal-&gt;day_view;</div><div class='del'>-		sub_page = 0;</div><div class='del'>-	} else if (strcmp (page_name, "workweekview") == 0) {</div><div class='del'>-		page = gcal-&gt;work_week_view;</div><div class='del'>-		sub_page = 1;</div><div class='del'>-	} else if (strcmp (page_name, "weekview") == 0) {</div><div class='del'>-		page = gcal-&gt;week_view;</div><div class='del'>-		sub_page = 2;</div><div class='del'>-	} else if (strcmp (page_name, "monthview") == 0) {</div><div class='del'>-		page = gcal-&gt;month_view;</div><div class='del'>-		main_page = 1;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Unknown calendar view: %s", page_name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_times (gcal, page);</div><div class='del'>-</div><div class='del'>-	if (sub_page != -1)</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK (gcal-&gt;sub_notebook),</div><div class='del'>-				       sub_page);</div><div class='del'>-	gtk_notebook_set_page (GTK_NOTEBOOK (gcal-&gt;main_notebook), main_page);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_gtk_calendar (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sends a mail notification of an alarm trigger */</div><div class='del'>-static void</div><div class='del'>-mail_notification (char *mail_address, char *text, time_t app_time)</div><div class='del'>-{</div><div class='del'>-	pid_t pid;</div><div class='del'>-	int   p [2];</div><div class='del'>-	char *command;</div><div class='del'>-</div><div class='del'>-	pipe (p);</div><div class='del'>-	pid = fork ();</div><div class='del'>-	if (pid == 0){</div><div class='del'>-		int dev_null;</div><div class='del'>-</div><div class='del'>-		dev_null = open ("/dev/null", O_RDWR);</div><div class='del'>-		dup2 (p [0], 0);</div><div class='del'>-		dup2 (dev_null, 1);</div><div class='del'>-		dup2 (dev_null, 2);</div><div class='del'>-		execl ("/usr/lib/sendmail", "/usr/lib/sendmail",</div><div class='del'>-		       mail_address, NULL);</div><div class='del'>-		_exit (127);</div><div class='del'>-	}</div><div class='del'>-	command = g_strconcat ("To: ", mail_address, "\n",</div><div class='del'>-				  "Subject: ", _("Reminder of your appointment at "),</div><div class='del'>-				  ctime (&amp;app_time), "\n\n", text, "\n", NULL);</div><div class='del'>-	write (p [1], command, strlen (command));</div><div class='del'>- 	close (p [1]);</div><div class='del'>-	close (p [0]);</div><div class='del'>-	g_free (command);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-max_open_files (void)</div><div class='del'>-{</div><div class='del'>-        static int files;</div><div class='del'>-</div><div class='del'>-        if (files)</div><div class='del'>-                return files;</div><div class='del'>-</div><div class='del'>-        files = sysconf (_SC_OPEN_MAX);</div><div class='del'>-        if (files != -1)</div><div class='del'>-                return files;</div><div class='del'>-#ifdef OPEN_MAX</div><div class='del'>-        return files = OPEN_MAX;</div><div class='del'>-#else</div><div class='del'>-        return files = 256;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Executes a program as a notification of an alarm trigger */</div><div class='del'>-static void</div><div class='del'>-program_notification (char *command, int close_standard)</div><div class='del'>-{</div><div class='del'>-	struct sigaction ignore, save_intr, save_quit;</div><div class='del'>-	int status = 0, i;</div><div class='del'>-	pid_t pid;</div><div class='del'>-</div><div class='del'>-	ignore.sa_handler = SIG_IGN;</div><div class='del'>-	sigemptyset (&amp;ignore.sa_mask);</div><div class='del'>-	ignore.sa_flags = 0;</div><div class='del'>-</div><div class='del'>-	sigaction (SIGINT, &amp;ignore, &amp;save_intr);</div><div class='del'>-	sigaction (SIGQUIT, &amp;ignore, &amp;save_quit);</div><div class='del'>-</div><div class='del'>-	if ((pid = fork ()) &lt; 0){</div><div class='del'>-		fprintf (stderr, "\n\nfork () = -1\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (pid == 0){</div><div class='del'>-		pid = fork ();</div><div class='del'>-		if (pid == 0){</div><div class='del'>-			const int top = max_open_files ();</div><div class='del'>-			sigaction (SIGINT,  &amp;save_intr, NULL);</div><div class='del'>-			sigaction (SIGQUIT, &amp;save_quit, NULL);</div><div class='del'>-</div><div class='del'>-			for (i = (close_standard ? 0 : 3); i &lt; top; i++)</div><div class='del'>-				close (i);</div><div class='del'>-</div><div class='del'>-			/* FIXME: As an excercise to the reader, copy the</div><div class='del'>-			 * code from mc to setup shell properly instead of</div><div class='del'>-			 * /bin/sh.  Yes, this comment is larger than a cut and paste.</div><div class='del'>-			 */</div><div class='del'>-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);</div><div class='del'>-</div><div class='del'>-			_exit (127);</div><div class='del'>-		} else {</div><div class='del'>-			_exit (127);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	wait (&amp;status);</div><div class='del'>-	sigaction (SIGINT,  &amp;save_intr, NULL);</div><div class='del'>-	sigaction (SIGQUIT, &amp;save_quit, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Queues a snooze alarm */</div><div class='del'>-static void</div><div class='del'>-snooze (GnomeCalendar *gcal, iCalObject *ico, time_t occur, int snooze_mins, gboolean audio)</div><div class='del'>-{</div><div class='del'>-	time_t now, trigger;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	CalAlarmInstance ai;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-	tm = *localtime (&amp;now);</div><div class='del'>-	tm.tm_min += snooze_mins;</div><div class='del'>-</div><div class='del'>-	trigger = mktime (&amp;tm);</div><div class='del'>-	if (trigger == -1) {</div><div class='del'>-		g_message ("snooze(): produced invalid time_t; not queueing alarm!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ai.uid = ico-&gt;uid;</div><div class='del'>-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;</div><div class='del'>-	ai.trigger = trigger;</div><div class='del'>-	ai.occur = occur;</div><div class='del'>-</div><div class='del'>-	setup_alarm (gcal, &amp;ai);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Edits an appointment from the alarm notification dialog */</div><div class='del'>-static void</div><div class='del'>-edit (GnomeCalendar *gcal, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	gnome_calendar_edit_object (gcal, ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct alarm_notify_closure {</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	time_t occur;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Callback used for the result of the alarm notification dialog */</div><div class='del'>-static void</div><div class='del'>-display_notification_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct alarm_notify_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_CLOSE:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_NOTIFY_SNOOZE:</div><div class='del'>-		snooze (c-&gt;gcal, c-&gt;ico, c-&gt;occur, snooze_mins, FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_NOTIFY_EDIT:</div><div class='del'>-		edit (c-&gt;gcal, c-&gt;ico);</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'>-	ical_object_unref (c-&gt;ico);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Present a display notification of an alarm trigger */</div><div class='del'>-static void</div><div class='del'>-display_notification (time_t trigger, time_t occur, iCalObject *ico, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	gboolean result;</div><div class='del'>-	struct alarm_notify_closure *c;</div><div class='del'>-</div><div class='del'>-	ical_object_ref (ico);</div><div class='del'>-</div><div class='del'>-	c = g_new (struct alarm_notify_closure, 1);</div><div class='del'>-	c-&gt;gcal = gcal;</div><div class='del'>-	c-&gt;ico = ico;</div><div class='del'>-	c-&gt;occur = occur;</div><div class='del'>-</div><div class='del'>-	result = alarm_notify_dialog (trigger, occur, ico, display_notification_cb, c);</div><div class='del'>-	if (!result) {</div><div class='del'>-		g_message ("display_notification(): could not display the alarm notification dialog");</div><div class='del'>-		g_free (c);</div><div class='del'>-		ical_object_unref (ico);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Present an audible notification of an alarm trigger */</div><div class='del'>-static void</div><div class='del'>-audio_notification (time_t trigger, time_t occur, iCalObject *ico, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_message ("AUDIO NOTIFICATION!");</div><div class='del'>-	/* FIXME */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct trigger_alarm_closure {</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	char *uid;</div><div class='del'>-	enum AlarmType type;</div><div class='del'>-	time_t occur;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Callback function used when an alarm is triggered */</div><div class='del'>-static void</div><div class='del'>-trigger_alarm_cb (gpointer alarm_id, time_t trigger, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct trigger_alarm_closure *c;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	ObjectAlarms *oa;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	c = data;</div><div class='del'>-</div><div class='del'>-	/* Fetch the object */</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (c-&gt;gcal-&gt;client, c-&gt;uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Go on */</div><div class='del'>-		break;</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		g_message ("trigger_alarm_cb(): syntax error in fetched object");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (ico != NULL);</div><div class='del'>-</div><div class='del'>-	/* Present notification */</div><div class='del'>-</div><div class='del'>-	switch (c-&gt;type) {</div><div class='del'>-	case ALARM_MAIL:</div><div class='del'>-		g_assert (ico-&gt;malarm.enabled);</div><div class='del'>-		mail_notification (ico-&gt;malarm.data, ico-&gt;summary, c-&gt;occur);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_PROGRAM:</div><div class='del'>-		g_assert (ico-&gt;palarm.enabled);</div><div class='del'>-		program_notification (ico-&gt;palarm.data, FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_DISPLAY:</div><div class='del'>-		g_assert (ico-&gt;dalarm.enabled);</div><div class='del'>-		display_notification (trigger, c-&gt;occur, ico, c-&gt;gcal);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_AUDIO:</div><div class='del'>-		g_assert (ico-&gt;aalarm.enabled);</div><div class='del'>-		audio_notification (trigger, c-&gt;occur, ico, c-&gt;gcal);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove the alarm from the hash table */</div><div class='del'>-</div><div class='del'>-	oa = g_hash_table_lookup (c-&gt;gcal-&gt;alarms, ico-&gt;uid);</div><div class='del'>-	g_assert (oa != NULL);</div><div class='del'>-</div><div class='del'>-	l = g_list_find (oa-&gt;alarm_ids, alarm_id);</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	oa-&gt;alarm_ids = g_list_remove_link (oa-&gt;alarm_ids, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	if (!oa-&gt;alarm_ids) {</div><div class='del'>-		g_hash_table_remove (c-&gt;gcal-&gt;alarms, ico-&gt;uid);</div><div class='del'>-		g_free (oa-&gt;uid);</div><div class='del'>-		g_free (oa);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees a struct trigger_alarm_closure */</div><div class='del'>-static void</div><div class='del'>-free_trigger_alarm_closure (gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct trigger_alarm_closure *c;</div><div class='del'>-</div><div class='del'>-	c = data;</div><div class='del'>-	g_free (c-&gt;uid);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Queues the specified alarm */</div><div class='del'>-static void</div><div class='del'>-setup_alarm (GnomeCalendar *cal, CalAlarmInstance *ai)</div><div class='del'>-{</div><div class='del'>-	struct trigger_alarm_closure *c;</div><div class='del'>-	gpointer alarm;</div><div class='del'>-	ObjectAlarms *oa;</div><div class='del'>-</div><div class='del'>-	c = g_new (struct trigger_alarm_closure, 1);</div><div class='del'>-	c-&gt;gcal = cal;</div><div class='del'>-	c-&gt;uid = g_strdup (ai-&gt;uid);</div><div class='del'>-	c-&gt;type = ai-&gt;type;</div><div class='del'>-	c-&gt;occur = ai-&gt;occur;</div><div class='del'>-</div><div class='del'>-	alarm = alarm_add (ai-&gt;trigger, trigger_alarm_cb, c, free_trigger_alarm_closure);</div><div class='del'>-	if (!alarm) {</div><div class='del'>-		g_message ("setup_alarm(): Could not set up alarm");</div><div class='del'>-		g_free (c-&gt;uid);</div><div class='del'>-		g_free (c);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	oa = g_hash_table_lookup (cal-&gt;alarms, ai-&gt;uid);</div><div class='del'>-	if (oa)</div><div class='del'>-		oa-&gt;alarm_ids = g_list_prepend (oa-&gt;alarm_ids, alarm);</div><div class='del'>-	else {</div><div class='del'>-		oa = g_new (ObjectAlarms, 1);</div><div class='del'>-		oa-&gt;uid = g_strdup (ai-&gt;uid);</div><div class='del'>-		oa-&gt;alarm_ids = g_list_prepend (NULL, alarm);</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (cal-&gt;alarms, oa-&gt;uid, oa);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void load_alarms (GnomeCalendar *cal);</div><div class='del'>-</div><div class='del'>-/* Called nightly to refresh the day's alarms */</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'>-	GnomeCalendar *cal;</div><div class='del'>-</div><div class='del'>-	cal = GNOME_CALENDAR (data);</div><div class='del'>-	cal-&gt;midnight_alarm_refresh_id = NULL;</div><div class='del'>-</div><div class='del'>-	load_alarms (cal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads and queues the alarms from the current time up to midnight. */</div><div class='del'>-static void</div><div class='del'>-load_alarms (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	time_t now;</div><div class='del'>-	time_t end_of_day;</div><div class='del'>-	GList *alarms, *l;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-	end_of_day = time_day_end (now);</div><div class='del'>-</div><div class='del'>-	/* Queue alarms */</div><div class='del'>-</div><div class='del'>-	alarms = cal_client_get_alarms_in_range (gcal-&gt;client, now, end_of_day);</div><div class='del'>-</div><div class='del'>-	for (l = alarms; l; l = l-&gt;next)</div><div class='del'>-		setup_alarm (gcal, l-&gt;data);</div><div class='del'>-</div><div class='del'>-	cal_alarm_instance_list_free (alarms);</div><div class='del'>-</div><div class='del'>-	/* Queue the midnight alarm refresh */</div><div class='del'>-</div><div class='del'>-	gcal-&gt;midnight_alarm_refresh_id = alarm_add (end_of_day, midnight_refresh_cb, gcal, NULL);</div><div class='del'>-	if (!gcal-&gt;midnight_alarm_refresh_id) {</div><div class='del'>-		g_message ("load_alarms(): 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'>-/* This tells all components to reload all calendar objects. */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_all (GnomeCalendar *cal)</div><div class='del'>-{</div><div class='del'>-	load_alarms (cal);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_all_events (E_DAY_VIEW (cal-&gt;day_view));</div><div class='del'>-	e_day_view_update_all_events (E_DAY_VIEW (cal-&gt;work_week_view));</div><div class='del'>-	e_week_view_update_all_events (E_WEEK_VIEW (cal-&gt;week_view));</div><div class='del'>-	e_week_view_update_all_events (E_WEEK_VIEW (cal-&gt;month_view));</div><div class='del'>-</div><div class='del'>-	gncal_todo_update (GNCAL_TODO (cal-&gt;todo), NULL, TRUE);</div><div class='del'>-	gnome_calendar_tag_calendar (cal, cal-&gt;gtk_calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes any queued alarms for the specified UID */</div><div class='del'>-static void</div><div class='del'>-remove_alarms_for_object (GnomeCalendar *gcal, const char *uid)</div><div class='del'>-{</div><div class='del'>-	ObjectAlarms *oa;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	oa = g_hash_table_lookup (gcal-&gt;alarms, uid);</div><div class='del'>-	if (!oa)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (l = oa-&gt;alarm_ids; l; l = l-&gt;next) {</div><div class='del'>-		gpointer alarm_id;</div><div class='del'>-</div><div class='del'>-		alarm_id = l-&gt;data;</div><div class='del'>-		alarm_remove (alarm_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (gcal-&gt;alarms, uid);</div><div class='del'>-</div><div class='del'>-	g_free (oa-&gt;uid);</div><div class='del'>-	g_list_free (oa-&gt;alarm_ids);</div><div class='del'>-	g_free (oa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds today's alarms for the specified object */</div><div class='del'>-static void</div><div class='del'>-add_alarms_for_object (GnomeCalendar *gcal, const char *uid)</div><div class='del'>-{</div><div class='del'>-	GList *alarms;</div><div class='del'>-	gboolean result;</div><div class='del'>-	time_t now, end_of_day;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-	end_of_day = time_day_end (now);</div><div class='del'>-</div><div class='del'>-	result = cal_client_get_alarms_for_object (gcal-&gt;client, uid, now, end_of_day, &amp;alarms);</div><div class='del'>-	if (!result) {</div><div class='del'>-		/* FIXME: should we warn here, or is it OK if the object</div><div class='del'>-		 * disappeared in the meantime?</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (l = alarms; l; l = l-&gt;next)</div><div class='del'>-		setup_alarm (gcal, l-&gt;data);</div><div class='del'>-</div><div class='del'>-	cal_alarm_instance_list_free (alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_object_updated_cb (GtkWidget *cal_client,</div><div class='del'>-				  const char *uid,</div><div class='del'>-				  GnomeCalendar  *gcal)</div><div class='del'>-{</div><div class='del'>-	g_message ("gnome-cal: got object changed_cb, uid='%s'",</div><div class='del'>-		   uid?uid:"&lt;NULL&gt;");</div><div class='del'>-</div><div class='del'>-	remove_alarms_for_object (gcal, uid);</div><div class='del'>-	add_alarms_for_object (gcal, uid);</div><div class='del'>-</div><div class='del'>-	/* FIXME: do we really want each view to reload the event itself?</div><div class='del'>-	   Maybe we should keep track of events globally, maybe with ref</div><div class='del'>-	   counts. We also need to sort out where they get freed. */</div><div class='del'>-	e_day_view_update_event (E_DAY_VIEW (gcal-&gt;day_view), uid);</div><div class='del'>-	e_day_view_update_event (E_DAY_VIEW (gcal-&gt;work_week_view), uid);</div><div class='del'>-	e_week_view_update_event (E_WEEK_VIEW (gcal-&gt;week_view), uid);</div><div class='del'>-	e_week_view_update_event (E_WEEK_VIEW (gcal-&gt;month_view), uid);</div><div class='del'>-</div><div class='del'>-	gncal_todo_update (GNCAL_TODO (gcal-&gt;todo), NULL, TRUE);</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, gcal-&gt;gtk_calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_object_removed_cb (GtkWidget *cal_client,</div><div class='del'>-				  const char *uid,</div><div class='del'>-				  GnomeCalendar  *gcal)</div><div class='del'>-{</div><div class='del'>-	g_message ("gnome-cal: got object removed _cb, uid='%s'",</div><div class='del'>-		   uid?uid:"&lt;NULL&gt;");</div><div class='del'>-</div><div class='del'>-	remove_alarms_for_object (gcal, uid);</div><div class='del'>-</div><div class='del'>-	e_day_view_remove_event (E_DAY_VIEW (gcal-&gt;day_view), uid);</div><div class='del'>-	e_day_view_remove_event (E_DAY_VIEW (gcal-&gt;work_week_view), uid);</div><div class='del'>-	e_week_view_remove_event (E_WEEK_VIEW (gcal-&gt;week_view), uid);</div><div class='del'>-	e_week_view_remove_event (E_WEEK_VIEW (gcal-&gt;month_view), uid);</div><div class='del'>-</div><div class='del'>-	gncal_todo_update (GNCAL_TODO (gcal-&gt;todo), NULL, CHANGE_ALL);</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, gcal-&gt;gtk_calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-gnome_calendar_new (char *title)</div><div class='del'>-{</div><div class='del'>-	GtkWidget      *retval;</div><div class='del'>-	GnomeCalendar  *gcal;</div><div class='del'>-</div><div class='del'>-	retval = gtk_type_new (gnome_calendar_get_type ());</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (retval);</div><div class='del'>-</div><div class='del'>-	gcal-&gt;selection_start_time = time_day_begin (time (NULL));</div><div class='del'>-	gcal-&gt;selection_end_time = time_add_day (gcal-&gt;selection_start_time, 1);</div><div class='del'>-	gcal-&gt;client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	setup_widgets (gcal);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, "dayview");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal-&gt;client), "obj_updated",</div><div class='del'>-			    gnome_calendar_object_updated_cb, gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal-&gt;client), "obj_removed",</div><div class='del'>-			    gnome_calendar_object_removed_cb, gcal);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	char *uri;</div><div class='del'>-	GnomeCalendarOpenMode gcom;</div><div class='del'>-	guint signal_handle;</div><div class='del'>-} load_or_create_data;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_load_cb (GtkWidget *cal_client,</div><div class='del'>-			CalClientLoadStatus status,</div><div class='del'>-			load_or_create_data *locd)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (locd);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (locd-&gt;gcal));</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_LOAD_SUCCESS:</div><div class='del'>-		gnome_calendar_update_all (locd-&gt;gcal);</div><div class='del'>-		g_message ("gnome_calendar_load_cb: success");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_LOAD_ERROR:</div><div class='del'>-		g_message ("gnome_calendar_load_cb: load error");</div><div class='del'>-		if (locd-&gt;gcom == CALENDAR_OPEN_OR_CREATE) {</div><div class='del'>-			g_message ("gnome_calendar_load_cb: trying create...");</div><div class='del'>-			/* FIXME: connect to the cal_loaded signal of the</div><div class='del'>-			 * CalClient and get theasynchronous notification</div><div class='del'>-			 * properly! */</div><div class='del'>-			/*gtk_signal_connect (GTK_OBJECT (gcal-&gt;client),</div><div class='del'>-					    "cal_loaded",</div><div class='del'>-					    gnome_calendar_create_cb, gcal);*/</div><div class='del'>-</div><div class='del'>-			gtk_signal_disconnect (GTK_OBJECT (locd-&gt;gcal-&gt;client),</div><div class='del'>-					       locd-&gt;signal_handle);</div><div class='del'>-</div><div class='del'>-			cal_client_create_calendar (locd-&gt;gcal-&gt;client,</div><div class='del'>-						    locd-&gt;uri);</div><div class='del'>-			gnome_calendar_update_all (locd-&gt;gcal);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_LOAD_IN_USE:</div><div class='del'>-		/* FIXME: what to do? */</div><div class='del'>-		g_message ("gnome_calendar_load_cb: in use");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED:</div><div class='del'>-		/* FIXME: what to do? */</div><div class='del'>-		g_message ("gnome_calendar_load_cb(): method not supported");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("gnome_calendar_load_cb(): unhandled result code %d!", (int) status);</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (locd-&gt;uri);</div><div class='del'>-	g_free (locd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-gnome_calendar_open (GnomeCalendar *gcal,</div><div class='del'>-		     char *file,</div><div class='del'>-		     GnomeCalendarOpenMode gcom)</div><div class='del'>-{</div><div class='del'>-	load_or_create_data *locd;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), 0);</div><div class='del'>-	g_return_val_if_fail (file != NULL, 0);</div><div class='del'>-</div><div class='del'>-	locd = g_new0 (load_or_create_data, 1);</div><div class='del'>-	locd-&gt;gcal = gcal;</div><div class='del'>-	locd-&gt;uri = g_strdup (file);</div><div class='del'>-	locd-&gt;gcom = gcom;</div><div class='del'>-</div><div class='del'>-	locd-&gt;signal_handle = gtk_signal_connect (GTK_OBJECT (gcal-&gt;client),</div><div class='del'>-						  "cal_loaded",</div><div class='del'>-						  gnome_calendar_load_cb,</div><div class='del'>-						  locd);</div><div class='del'>-</div><div class='del'>-	if (cal_client_load_calendar (gcal-&gt;client, file) == FALSE){</div><div class='del'>-		g_message ("Error loading calendar: %s", file);</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 void</div><div class='del'>-stop_beeping (GtkObject* object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	guint timer_tag, beep_tag;</div><div class='del'>-	timer_tag = GPOINTER_TO_INT (gtk_object_get_data (object, "timer_tag"));</div><div class='del'>-	beep_tag  = GPOINTER_TO_INT (gtk_object_get_data (object, "beep_tag"));</div><div class='del'>-	</div><div class='del'>-	if (beep_tag &gt; 0) {</div><div class='del'>-		gtk_timeout_remove (beep_tag);</div><div class='del'>-		gtk_object_set_data (object, "beep_tag", GINT_TO_POINTER (0));</div><div class='del'>-	}</div><div class='del'>-	if (timer_tag &gt; 0) {</div><div class='del'>-		gtk_timeout_remove (timer_tag);</div><div class='del'>-		gtk_object_set_data (object, "timer_tag", GINT_TO_POINTER (0));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-start_beeping (gpointer data)</div><div class='del'>-{</div><div class='del'>-	gdk_beep ();</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'>-timeout_beep (gpointer data)</div><div class='del'>-{</div><div class='del'>-	stop_beeping (data, NULL);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_notify (time_t activation_time, CalendarAlarm *which, void *data)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico = data;</div><div class='del'>-	guint beep_tag, timer_tag;</div><div class='del'>-	int ret;</div><div class='del'>-	gchar* snooze_button = (enable_snooze ? _("Snooze") : NULL);</div><div class='del'>-	time_t now, diff;</div><div class='del'>-</div><div class='del'>-	if (&amp;ico-&gt;aalarm == which){</div><div class='del'>-		time_t app = ico-&gt;aalarm.trigger + ico-&gt;aalarm.offset;</div><div class='del'>-		GtkWidget *w;</div><div class='del'>-		char *msg;</div><div class='del'>-</div><div class='del'>-		msg = g_strconcat (_("Reminder of your appointment at "),</div><div class='del'>-					ctime (&amp;app), "`",</div><div class='del'>-					ico-&gt;summary, "'", NULL);</div><div class='del'>-</div><div class='del'>-		/* Idea: we need Snooze option :-) */</div><div class='del'>-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, _("Ok"), snooze_button, NULL);</div><div class='del'>-		beep_tag = gtk_timeout_add (1000, start_beeping, NULL);</div><div class='del'>-		if (enable_aalarm_timeout)</div><div class='del'>-			timer_tag = gtk_timeout_add (audio_alarm_timeout*1000, </div><div class='del'>-						     timeout_beep, w);</div><div class='del'>-		else</div><div class='del'>-			timer_tag = 0;</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (w), "timer_tag",</div><div class='del'>-				     GINT_TO_POINTER (timer_tag));</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (w), "beep_tag",</div><div class='del'>-				     GINT_TO_POINTER (beep_tag));</div><div class='del'>-		gtk_widget_ref (w);</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);</div><div class='del'>-		ret = gnome_dialog_run (GNOME_DIALOG (w));</div><div class='del'>-		switch (ret) {</div><div class='del'>-		case 1:</div><div class='del'>-			stop_beeping (GTK_OBJECT (w), NULL);</div><div class='del'>-			now = time (NULL);</div><div class='del'>-			diff = now - which-&gt;trigger;</div><div class='del'>-			which-&gt;trigger = which-&gt;trigger + diff + snooze_secs;</div><div class='del'>-			which-&gt;offset  = which-&gt;offset - diff - snooze_secs;</div><div class='del'>-			alarm_add (which, &amp;calendar_notify, data);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			stop_beeping (GTK_OBJECT (w), NULL);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		gtk_widget_unref (w);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        if (&amp;ico-&gt;palarm == which){</div><div class='del'>-		execute (ico-&gt;palarm.data, 0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (&amp;ico-&gt;malarm == which){</div><div class='del'>-		time_t app = ico-&gt;malarm.trigger + ico-&gt;malarm.offset;</div><div class='del'>-</div><div class='del'>-		mail_notify (ico-&gt;malarm.data, ico-&gt;summary, app);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (&amp;ico-&gt;dalarm == which){</div><div class='del'>-		time_t app = ico-&gt;dalarm.trigger + ico-&gt;dalarm.offset;</div><div class='del'>-		GtkWidget *w;</div><div class='del'>-		char *msg;</div><div class='del'>-</div><div class='del'>-		if (beep_on_display)</div><div class='del'>-			gdk_beep ();</div><div class='del'>-		msg = g_strconcat (_("Reminder of your appointment at "),</div><div class='del'>-					ctime (&amp;app), "`",</div><div class='del'>-					ico-&gt;summary, "'", NULL);</div><div class='del'>-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, </div><div class='del'>-					   _("Ok"), snooze_button, NULL);</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);</div><div class='del'>-		ret = gnome_dialog_run (GNOME_DIALOG (w));</div><div class='del'>-		switch (ret) {</div><div class='del'>-		case 1:</div><div class='del'>-			now = time (NULL);</div><div class='del'>-			diff = now - which-&gt;trigger;</div><div class='del'>-			which-&gt;trigger = which-&gt;trigger + diff + snooze_secs;</div><div class='del'>-			which-&gt;offset  = which-&gt;offset - diff - snooze_secs;</div><div class='del'>-			alarm_add (which, &amp;calendar_notify, 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'>-		return;</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'>-/* Marks the specified range in a GtkCalendar */</div><div class='del'>-static void</div><div class='del'>-mark_gtk_calendar_day (GtkCalendar *calendar, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	t = time_day_begin (start);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct tm tm;</div><div class='del'>-</div><div class='del'>-		tm = *localtime (&amp;t);</div><div class='del'>-		gtk_calendar_mark_day (calendar, tm.tm_mday);</div><div class='del'>-</div><div class='del'>-		t = time_day_end (t);</div><div class='del'>-	} while (t &lt; end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Tags the dates with appointments in a GtkCalendar based on the</div><div class='del'>- * GnomeCalendar contents</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_tag_calendar (GnomeCalendar *cal, GtkCalendar *gtk_cal)</div><div class='del'>-{</div><div class='del'>-	time_t month_begin, month_end;</div><div class='del'>-	GList *cois, *l;</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'>-	g_return_if_fail (gtk_cal != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_CALENDAR (gtk_cal));</div><div class='del'>-</div><div class='del'>-	/* If the GtkCalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (cal-&gt;gtk_calendar))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	month_begin = time_from_day (gtk_cal-&gt;year, gtk_cal-&gt;month, 1);</div><div class='del'>-	if (month_begin == -1) {</div><div class='del'>-		g_message ("gnome_calendar_tag_calendar(): Generated invalid month begin!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	month_end = time_month_end (month_begin);</div><div class='del'>-	if (month_end == -1) {</div><div class='del'>-		g_message ("gnome_calendar_tag_calendar(): Generated invalid month end!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_calendar_freeze (gtk_cal);</div><div class='del'>-	gtk_calendar_clear_marks (gtk_cal);</div><div class='del'>-</div><div class='del'>-	cois = cal_client_get_events_in_range (cal-&gt;client, month_begin,</div><div class='del'>-					       month_end);</div><div class='del'>-</div><div class='del'>-	for (l = cois; l; l = l-&gt;next) {</div><div class='del'>-		CalObjInstance *coi = l-&gt;data;</div><div class='del'>-		time_t start, end;</div><div class='del'>-</div><div class='del'>-		start = MAX (coi-&gt;start, month_begin);</div><div class='del'>-		end = MIN (coi-&gt;end, month_end);</div><div class='del'>-</div><div class='del'>-		if (start &gt; end)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Clip the occurrence's start and end times to the month's limits */</div><div class='del'>-		mark_gtk_calendar_day (gtk_cal, start, end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_instance_list_free (cois);</div><div class='del'>-</div><div class='del'>-	gtk_calendar_thaw (gtk_cal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when the day begin &amp; end times, the AM/PM flag, or the</div><div class='del'>-   week_starts_on_monday flags are changed.</div><div class='del'>-   FIXME: Which of these options do we want the new views to support? */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_time_format_changed (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'>-	gtk_calendar_display_options (gcal-&gt;gtk_calendar,</div><div class='del'>-				      (week_starts_on_monday</div><div class='del'>-				       ? (gcal-&gt;gtk_calendar-&gt;display_flags</div><div class='del'>-					  | GTK_CALENDAR_WEEK_START_MONDAY)</div><div class='del'>-				       : (gcal-&gt;gtk_calendar-&gt;display_flags</div><div class='del'>-					  &amp; ~GTK_CALENDAR_WEEK_START_MONDAY)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any of the color settings are changed.</div><div class='del'>-   FIXME: Need to update for the new views. */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_colors_changed (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'>-	todo_style_changed = 1;</div><div class='del'>-	gncal_todo_update (GNCAL_TODO (gcal-&gt;todo), NULL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_todo_properties_changed (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'>-	todo_style_changed = 1;</div><div class='del'>-	gncal_todo_update (GNCAL_TODO (gcal-&gt;todo), NULL, 0);</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'>-	gcal-&gt;selection_start_time = start_time;</div><div class='del'>-	gcal-&gt;selection_end_time = end_time;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_gtk_calendar (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an event editor finishes editing an object */</div><div class='del'>-static void</div><div class='del'>-ical_object_released_cb (EventEditor *ee, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</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'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	result = g_hash_table_lookup_extended (gcal-&gt;object_editor_hash, 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'>-	g_hash_table_remove (gcal-&gt;object_editor_hash, orig_uid);</div><div class='del'>-	g_free (orig_uid);</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'>-static void</div><div class='del'>-editor_closed_cb (EventEditor *ee, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ee));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an event editor requests that an object be saved */</div><div class='del'>-static void</div><div class='del'>-save_ical_object_cb (EventEditor *ee, iCalObject *ico, 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'>-	if (!cal_client_update_object (gcal-&gt;client, ico))</div><div class='del'>-		g_message ("save_ical_object_cb(): Could not update the object!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_edit_object (GnomeCalendar *gcal, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</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 (ico != NULL);</div><div class='del'>-	g_return_if_fail (ico-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	ee = g_hash_table_lookup (gcal-&gt;object_editor_hash, ico-&gt;uid);</div><div class='del'>-	if (!ee) {</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'>-</div><div class='del'>-		/* FIXME: what to do when an event editor wants to switch</div><div class='del'>-		 * objects?  We would need to know about it as well.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (gcal-&gt;object_editor_hash, g_strdup (ico-&gt;uid), ee);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (ee), "ical_object_released",</div><div class='del'>-				    GTK_SIGNAL_FUNC (ical_object_released_cb), gcal);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (ee), "editor_closed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (editor_closed_cb), gcal);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (ee), "save_ical_object",</div><div class='del'>-				    GTK_SIGNAL_FUNC (save_ical_object_cb), gcal);</div><div class='del'>-</div><div class='del'>-		event_editor_set_ical_object (EVENT_EDITOR (ee), ico);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	event_editor_focus (ee);</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'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == gcal-&gt;day_view</div><div class='del'>-	    || page == gcal-&gt;work_week_view)</div><div class='del'>-		e_day_view_get_selected_time_range (E_DAY_VIEW (page),</div><div class='del'>-						    start_time, end_time);</div><div class='del'>-	else if (page == gcal-&gt;week_view</div><div class='del'>-		 || page == gcal-&gt;month_view)</div><div class='del'>-		e_week_view_get_selected_time_range (E_WEEK_VIEW (page),</div><div class='del'>-						     start_time, end_time);</div><div class='del'>-	else {</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'>-</div><div class='del'>-</div><div class='del'>-/* This updates the month shown and the day selected in the calendar, if</div><div class='del'>-   necessary. */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_gtk_calendar (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	guint current_year, current_month, current_day;</div><div class='del'>-	guint new_year, new_month, new_day;</div><div class='del'>-	gboolean set_day = FALSE;</div><div class='del'>-</div><div class='del'>-	/* If the GtkCalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (gcal-&gt;gtk_calendar))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_calendar_get_date (gcal-&gt;gtk_calendar, &amp;current_year,</div><div class='del'>-			       &amp;current_month, &amp;current_day);</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_time (&amp;date, gcal-&gt;selection_start_time);</div><div class='del'>-	new_year = g_date_year (&amp;date);</div><div class='del'>-	new_month = g_date_month (&amp;date) - 1;</div><div class='del'>-	new_day = g_date_day (&amp;date);</div><div class='del'>-</div><div class='del'>-	/* Block the "day_selected" signal while we update the calendar. */</div><div class='del'>-	gtk_signal_handler_block (GTK_OBJECT (gcal-&gt;gtk_calendar),</div><div class='del'>-				  gcal-&gt;day_selected_id);</div><div class='del'>-</div><div class='del'>-	/* If the year &amp; month don't match, update it. */</div><div class='del'>-	if (new_year != current_year || new_month != current_month) {</div><div class='del'>-		/* FIXME: GtkCalendar bug workaround. If we select a month</div><div class='del'>-		   which has less days than the currently selected day, it</div><div class='del'>-		   causes a problem next time we set the day. */</div><div class='del'>-		if (current_day &gt; 28) {</div><div class='del'>-			gtk_calendar_select_day (gcal-&gt;gtk_calendar, 28);</div><div class='del'>-			set_day = TRUE;</div><div class='del'>-		}</div><div class='del'>-		gtk_calendar_select_month (gcal-&gt;gtk_calendar, new_month,</div><div class='del'>-					   new_year);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the day doesn't match, update it. */</div><div class='del'>-	if (new_day != current_day || set_day)</div><div class='del'>-		gtk_calendar_select_day (gcal-&gt;gtk_calendar, new_day);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock (GTK_OBJECT (gcal-&gt;gtk_calendar),</div><div class='del'>-				    gcal-&gt;day_selected_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_day_selected (GtkCalendar   *calendar,</div><div class='del'>-				GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	gint y, m, d;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	gtk_calendar_get_date (calendar, &amp;y, &amp;m, &amp;d);</div><div class='del'>-</div><div class='del'>-	tm.tm_year = y - 1900;</div><div class='del'>-	tm.tm_mon  = m;</div><div class='del'>-	tm.tm_mday = d;</div><div class='del'>-	tm.tm_hour = 5; /* for daylight savings time fix */</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_goto (gcal, mktime (&amp;tm));</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_month_changed (GtkCalendar   *calendar,</div><div class='del'>-				 GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, gcal-&gt;gtk_calendar);</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 77dc57a8c0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnome-cal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,132 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * GnomeCalendar widget</div><div class='del'>- * Copyright (C) 1998 the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza (miguel@kernel.org)</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&gt;</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/gtkcalendar.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;bonobo.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 GNOME_CALENDAR(obj)         GTK_CHECK_CAST(obj, gnome_calendar_get_type(), GnomeCalendar)</div><div class='del'>-#define GNOME_CALENDAR_CLASS(class) GTK_CHECK_CAST_CLASS(class, gnome_calendar_get_type(), GnomeCalendarClass)</div><div class='del'>-#define GNOME_IS_CALENDAR(obj)      GTK_CHECK_TYPE(obj, gnome_calendar_get_type())</div><div class='del'>-</div><div class='del'>-#define GNOME_CALENDAR_NUM_VIEWS	4</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkVBox      vbox;</div><div class='del'>-</div><div class='del'>-	CalClient   *client;</div><div class='del'>-</div><div class='del'>-        BonoboPropertyBag *properties;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	GHashTable  *object_editor_hash;</div><div class='del'>-</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'>-	GtkWidget   *main_notebook;</div><div class='del'>-	GtkWidget   *sub_notebook;</div><div class='del'>-	GtkWidget   *hpane;</div><div class='del'>-	GtkCalendar *gtk_calendar;</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'>-	GtkWidget   *view_toolbar_buttons[GNOME_CALENDAR_NUM_VIEWS];</div><div class='del'>-</div><div class='del'>-	void        *event_editor;</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'>-	/* Alarm ID for the midnight refresh function */</div><div class='del'>-	gpointer midnight_alarm_refresh_id;</div><div class='del'>-</div><div class='del'>-	/* UID-&gt;alarms hash */</div><div class='del'>-	GHashTable *alarms;</div><div class='del'>-} GnomeCalendar;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-} GnomeCalendarClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-  CALENDAR_OPEN,</div><div class='del'>-  CALENDAR_OPEN_OR_CREATE</div><div class='del'>-} GnomeCalendarOpenMode;</div><div class='del'>-</div><div class='del'>-guint      gnome_calendar_get_type         	(void);</div><div class='del'>-GtkWidget *gnome_calendar_new			(char *title);</div><div class='del'>-int        gnome_calendar_open                  (GnomeCalendar *gcal,</div><div class='del'>-						 char *file,</div><div class='del'>-						 GnomeCalendarOpenMode gcom);</div><div class='del'>-/*</div><div class='del'>-int	   gnome_calendar_create		(GnomeCalendar *gcal,</div><div class='del'>-						 char *file);</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'>-void       gnome_calendar_tag_calendar          (GnomeCalendar *cal,</div><div class='del'>-						 GtkCalendar *gtk_cal);</div><div class='del'>-char      *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);</div><div class='del'>-void       gnome_calendar_set_view              (GnomeCalendar *gcal,</div><div class='del'>-						 char *page_name);</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'>-</div><div class='del'>-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,</div><div class='del'>-						 iCalObject    *ico);</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'>-</div><div class='del'>-/* Notifies the calendar that the time format has changed and it must update all its views */</div><div class='del'>-void gnome_calendar_time_format_changed (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Notifies the calendar that the todo list properties have changed and its time</div><div class='del'>- * to update the views.</div><div class='del'>- */</div><div class='del'>-void gnome_calendar_colors_changed (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Notifies the calendar that the todo list properties have changed and its time</div><div class='del'>- * to update the views.</div><div class='del'>- */</div><div class='del'>-void gnome_calendar_todo_properties_changed (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-cal.html b/calendar/gui/gnome-cal.html<br/>deleted file mode 100644<br/>index 5a7d0a537f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.html?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnome-cal.html</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-&lt;!-- Some simple instructions on how to use the help browser --&gt;</div><div class='del'>-&lt;BODY&gt;</div><div class='del'>-&lt;!-- &lt;TITLE&gt;GNOME Calendar Documentation&lt;/TITLE&gt; --&gt;</div><div class='del'>-&lt;H2&gt; GNOME Calendar Documentation &lt;/H2&gt;</div><div class='del'>-&lt;p&gt;</div><div class='del'>-The GNOME calendar program is the calendaring program of the GNOME</div><div class='del'>-system.  It uses the vCalendar standard for transfering calendar</div><div class='del'>-information (and is also the on-disk format used). </div><div class='del'>-</div><div class='del'>-&lt;p&gt;</div><div class='del'>-</div><div class='del'>-&lt;a name="cmdline"&gt;</div><div class='del'>-&lt;h2&gt;Command line options&lt;/h2&gt;</div><div class='del'>-</div><div class='del'>-Several options are available on the command line, they are:</div><div class='del'>-&lt;ul&gt;</div><div class='del'>-	&lt;li&gt;&lt;tt&gt;--events&lt;/tt&gt; Displays the events for the date</div><div class='del'>-	specified (or today, if no date is specified).</div><div class='del'>-</div><div class='del'>-	&lt;li&gt;&lt;tt&gt;--from DATE&lt;/tt&gt; Define the beginning of the range for</div><div class='del'>-	the event display, or the startup day on the calenday views.</div><div class='del'>-	By default, the event will span the whole day specified in</div><div class='del'>-	DATE. </div><div class='del'>-</div><div class='del'>-	&lt;li&gt;&lt;tt&gt;--to DATE&lt;/tt&gt; Define the range end for the event</div><div class='del'>-	display.  If this is not specified, it will default to the end</div><div class='del'>-	of the day specified by the &lt;tt&gt;--from&lt;/tt&gt; option.</div><div class='del'>-</div><div class='del'>-	&lt;li&gt;&lt;tt&gt;--file FILE&lt;/tt&gt; Set the calendar to the FILE</div><div class='del'>-	specified on the command line. </div><div class='del'>-</div><div class='del'>-	&lt;li&gt;&lt;tt&gt;--todo&lt;/tt&gt; Dumps the to-do values to standard output. </div><div class='del'>-&lt;/ul&gt;</div><div class='del'>-</div><div class='del'>-&lt;p&gt;</div><div class='del'>-</div><div class='del'>-DATE is interpreted as being in the local time- zone, unless a</div><div class='del'>-specific timezone is specified.  Examples of valid date specifications</div><div class='del'>-include: "1 month ago",  "2 hours ago",  "400000 seconds ago",  "last</div><div class='del'>-year", "last Monday",  "yesterday",  "a fortnight ago",  "3/31/92</div><div class='del'>-10:00:07 PST",  "January 23, 1987 10:05pm", "22:00 GMT".</div><div class='del'>-</div><div class='del'>-&lt;/BODY&gt;</div><div class='del'>-</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnome-calendar-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/gui/gnome-month-item.c b/calendar/gui/gnome-month-item.c<br/>deleted file mode 100644<br/>index 58e393e4ee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-month-item.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnome-month-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1246 +0,0 @@</div><div class='del'>-/* General-purpose monthly calendar canvas item for GNOME</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat Software, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.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;gnome.h&gt;</div><div class='del'>-#include "gnome-month-item.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DEFAULT_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Number of days in a month, for normal and leap years */</div><div class='del'>-static const int days_in_month[2][12] = {</div><div class='del'>-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },</div><div class='del'>-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the</div><div class='del'>- * Gregorian reformation.</div><div class='del'>- */</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'>-</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'>-#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'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_YEAR,</div><div class='del'>-	ARG_MONTH,</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_ANCHOR,</div><div class='del'>-	ARG_HEAD_PADDING,</div><div class='del'>-	ARG_DAY_PADDING,</div><div class='del'>-	ARG_DAY_NAMES,</div><div class='del'>-	ARG_HEADING_HEIGHT,</div><div class='del'>-	ARG_HEADING_ANCHOR,</div><div class='del'>-	ARG_DAY_ANCHOR,</div><div class='del'>-	ARG_START_ON_MONDAY,</div><div class='del'>-	ARG_HEAD_FONT,</div><div class='del'>-	ARG_HEAD_FONTSET,</div><div class='del'>-	ARG_HEAD_FONT_GDK,</div><div class='del'>-	ARG_DAY_FONT,</div><div class='del'>-	ARG_DAY_FONTSET,</div><div class='del'>-	ARG_DAY_FONT_GDK,</div><div class='del'>-	ARG_HEAD_COLOR,</div><div class='del'>-	ARG_HEAD_COLOR_GDK,</div><div class='del'>-	ARG_OUTLINE_COLOR,</div><div class='del'>-	ARG_OUTLINE_COLOR_GDK,</div><div class='del'>-	ARG_DAY_BOX_COLOR,</div><div class='del'>-	ARG_DAY_BOX_COLOR_GDK,</div><div class='del'>-	ARG_DAY_COLOR,</div><div class='del'>-	ARG_DAY_COLOR_GDK</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void gnome_month_item_class_init (GnomeMonthItemClass *class);</div><div class='del'>-static void gnome_month_item_init       (GnomeMonthItem      *mitem);</div><div class='del'>-static void gnome_month_item_destroy    (GtkObject           *object);</div><div class='del'>-static void gnome_month_item_set_arg    (GtkObject           *object,</div><div class='del'>-					 GtkArg              *arg,</div><div class='del'>-					 guint                arg_id);</div><div class='del'>-static void gnome_month_item_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'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasGroupClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-gnome_month_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType month_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!month_item_type) {</div><div class='del'>-		GtkTypeInfo month_item_info = {</div><div class='del'>-			"GnomeMonthItem",</div><div class='del'>-			sizeof (GnomeMonthItem),</div><div class='del'>-			sizeof (GnomeMonthItemClass),</div><div class='del'>-			(GtkClassInitFunc) gnome_month_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) gnome_month_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'>-		month_item_type = gtk_type_unique (gnome_canvas_group_get_type (), &amp;month_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return month_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_month_item_class_init (GnomeMonthItemClass *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 *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</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 ("GnomeMonthItem::year", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_YEAR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::month", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_MONTH);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::x", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::y", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::width", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_WIDTH);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::height", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEIGHT);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_ANCHOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_padding", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEAD_PADDING);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_padding", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_DAY_PADDING);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_names", GTK_TYPE_POINTER, GTK_ARG_WRITABLE, ARG_DAY_NAMES);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_height", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEADING_HEIGHT);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_HEADING_ANCHOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_DAY_ANCHOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::start_on_monday", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_START_ON_MONDAY);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONT);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONTSET);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_HEAD_FONT_GDK);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONT);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONTSET);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_DAY_FONT_GDK);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_COLOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::heading_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_HEAD_COLOR_GDK);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::outline_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_OUTLINE_COLOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::outline_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_OUTLINE_COLOR_GDK);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_box_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_BOX_COLOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_box_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_DAY_BOX_COLOR_GDK);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_COLOR);</div><div class='del'>-	gtk_object_add_arg_type ("GnomeMonthItem::day_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_DAY_COLOR_GDK);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = gnome_month_item_destroy;</div><div class='del'>-	object_class-&gt;set_arg = gnome_month_item_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = gnome_month_item_get_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calculates the minimum heading height based on the heading font size and padding.  It also</div><div class='del'>- * calculates the minimum width of the month item based on the width of the headings.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-check_heading_sizes (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	double m_height;</div><div class='del'>-	double m_width;</div><div class='del'>-	int width;</div><div class='del'>-	int max_width;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Calculate minimum height */</div><div class='del'>-</div><div class='del'>-	m_height = mitem-&gt;head_font-&gt;ascent + mitem-&gt;head_font-&gt;descent + 2 * mitem-&gt;head_padding;</div><div class='del'>-</div><div class='del'>-	if (mitem-&gt;head_height &lt; m_height)</div><div class='del'>-		mitem-&gt;head_height = m_height;</div><div class='del'>-	</div><div class='del'>-	/* Go through each heading and remember the widest one */</div><div class='del'>-</div><div class='del'>-	max_width = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		width = gdk_string_width (mitem-&gt;head_font, mitem-&gt;day_names[i]);</div><div class='del'>-		if (max_width &lt; width)</div><div class='del'>-			max_width = width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	m_width = 7 * (max_width + 2 * mitem-&gt;head_padding);</div><div class='del'>-</div><div class='del'>-	if (mitem-&gt;width &lt; m_width)</div><div class='del'>-		mitem-&gt;width = m_width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calculates the minimum width and height of the month item based on the day font size and padding.</div><div class='del'>- * Assumes that the minimum heading height has already been computed.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-check_day_sizes (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	double m_height;</div><div class='del'>-	double m_width;</div><div class='del'>-	int width;</div><div class='del'>-	int max_width;</div><div class='del'>-	char buf[100];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Calculate minimum height */</div><div class='del'>-</div><div class='del'>-	m_height = mitem-&gt;head_height + 6 * (mitem-&gt;day_font-&gt;ascent + mitem-&gt;day_font-&gt;descent + 2 * mitem-&gt;day_padding);</div><div class='del'>-</div><div class='del'>-	if (mitem-&gt;height &lt; m_height)</div><div class='del'>-		mitem-&gt;height = m_height;</div><div class='del'>-</div><div class='del'>-	/* Calculate minimum width */</div><div class='del'>-</div><div class='del'>-	max_width = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; 32; i++) {</div><div class='del'>-		sprintf (buf, "%d", i);</div><div class='del'>-		width = gdk_string_width (mitem-&gt;day_font, buf);</div><div class='del'>-		if (max_width &lt; width)</div><div class='del'>-			max_width = width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	m_width = 7 * (max_width + 2 * mitem-&gt;day_padding);</div><div class='del'>-</div><div class='del'>-	if (mitem-&gt;width &lt; m_width)</div><div class='del'>-		mitem-&gt;width = m_width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calculates the minimum size of the month item based on the font sizes and paddings.  If the</div><div class='del'>- * current size of the month item is smaller than the required minimum size, this function will</div><div class='del'>- * change the size to the appropriate values.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-check_sizes (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	check_heading_sizes (mitem);</div><div class='del'>-	check_day_sizes (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Recalculates the position of the toplevel calendar group based on the logical position and anchor */</div><div class='del'>-static void</div><div class='del'>-reanchor (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	double x, y;</div><div class='del'>-</div><div class='del'>-	x = mitem-&gt;x;</div><div class='del'>-	y = mitem-&gt;y;</div><div class='del'>-</div><div class='del'>-	switch (mitem-&gt;anchor) {</div><div class='del'>-	case GTK_ANCHOR_NW:</div><div class='del'>-	case GTK_ANCHOR_W:</div><div class='del'>-	case GTK_ANCHOR_SW:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_N:</div><div class='del'>-	case GTK_ANCHOR_CENTER:</div><div class='del'>-	case GTK_ANCHOR_S:</div><div class='del'>-		x -= mitem-&gt;width / 2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_NE:</div><div class='del'>-	case GTK_ANCHOR_E:</div><div class='del'>-	case GTK_ANCHOR_SE:</div><div class='del'>-		x -= mitem-&gt;width;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (mitem-&gt;anchor) {</div><div class='del'>-	case GTK_ANCHOR_NW:</div><div class='del'>-	case GTK_ANCHOR_N:</div><div class='del'>-	case GTK_ANCHOR_NE:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_W:</div><div class='del'>-	case GTK_ANCHOR_CENTER:</div><div class='del'>-	case GTK_ANCHOR_E:</div><div class='del'>-		y -= mitem-&gt;height / 2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_SW:</div><div class='del'>-	case GTK_ANCHOR_S:</div><div class='del'>-	case GTK_ANCHOR_SE:</div><div class='del'>-		y -= mitem-&gt;height;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Explicitly use the canvas group class prefix since the month item class has x and y</div><div class='del'>-	 * arguments as well.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),</div><div class='del'>-			       "GnomeCanvasGroup::x", x,</div><div class='del'>-			       "GnomeCanvasGroup::y", y,</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Takes an anchor specification and the corners of a rectangle, and returns an anchored point with</div><div class='del'>- * respect to that rectangle.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-get_label_anchor (GtkAnchorType anchor, double x1, double y1, double x2, double y2, double *x, double *y)</div><div class='del'>-{</div><div class='del'>-	switch (anchor) {</div><div class='del'>-	case GTK_ANCHOR_NW:</div><div class='del'>-	case GTK_ANCHOR_W:</div><div class='del'>-	case GTK_ANCHOR_SW:</div><div class='del'>-		*x = x1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_N:</div><div class='del'>-	case GTK_ANCHOR_CENTER:</div><div class='del'>-	case GTK_ANCHOR_S:</div><div class='del'>-		*x = (x1 + x2) / 2.0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_NE:</div><div class='del'>-	case GTK_ANCHOR_E:</div><div class='del'>-	case GTK_ANCHOR_SE:</div><div class='del'>-		*x = x2;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (anchor) {</div><div class='del'>-	case GTK_ANCHOR_NW:</div><div class='del'>-	case GTK_ANCHOR_N:</div><div class='del'>-	case GTK_ANCHOR_NE:</div><div class='del'>-		*y = y1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_W:</div><div class='del'>-	case GTK_ANCHOR_CENTER:</div><div class='del'>-	case GTK_ANCHOR_E:</div><div class='del'>-		*y = (y1 + y2) / 2.0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_ANCHOR_SW:</div><div class='del'>-	case GTK_ANCHOR_S:</div><div class='del'>-	case GTK_ANCHOR_SE:</div><div class='del'>-		*y = y2;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resets the position of the day name headings in the calendar */</div><div class='del'>-static void</div><div class='del'>-reshape_headings (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	int i;</div><div class='del'>-	double x, y;</div><div class='del'>-</div><div class='del'>-	width = mitem-&gt;width / 7;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		/* Group */</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_GROUP + i],</div><div class='del'>-				       "x", width * i,</div><div class='del'>-				       "y", 0.0,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		/* Box */</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_BOX + i],</div><div class='del'>-				       "x1", 0.0,</div><div class='del'>-				       "y1", 0.0,</div><div class='del'>-				       "x2", width,</div><div class='del'>-				       "y2", mitem-&gt;head_height,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		/* Label */</div><div class='del'>-		get_label_anchor (mitem-&gt;head_anchor,</div><div class='del'>-				  mitem-&gt;head_padding,</div><div class='del'>-				  mitem-&gt;head_padding,</div><div class='del'>-				  width - mitem-&gt;head_padding,</div><div class='del'>-				  mitem-&gt;head_height - mitem-&gt;head_padding,</div><div class='del'>-				  &amp;x, &amp;y);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_LABEL + i],</div><div class='del'>-				       "x", x,</div><div class='del'>-				       "y", y,</div><div class='del'>-				       "anchor", mitem-&gt;head_anchor,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resets the position of the days in the calendar */</div><div class='del'>-static void</div><div class='del'>-reshape_days (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	double width, height;</div><div class='del'>-	double x, y;</div><div class='del'>-	int row, col;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	width = mitem-&gt;width / 7;</div><div class='del'>-	height = (mitem-&gt;height - mitem-&gt;head_height) / 6;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-</div><div class='del'>-	for (row = 0; row &lt; 6; row++)</div><div class='del'>-		for (col = 0; col &lt; 7; col++) {</div><div class='del'>-			/* Group */</div><div class='del'>-			gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_GROUP + i],</div><div class='del'>-					       "x", width * col,</div><div class='del'>-					       "y", mitem-&gt;head_height + height * row,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			/* Box */</div><div class='del'>-			gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_BOX + i],</div><div class='del'>-					       "x1", 0.0,</div><div class='del'>-					       "y1", 0.0,</div><div class='del'>-					       "x2", width,</div><div class='del'>-					       "y2", height,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			/* Label */</div><div class='del'>-			get_label_anchor (mitem-&gt;day_anchor,</div><div class='del'>-					  mitem-&gt;day_padding,</div><div class='del'>-					  mitem-&gt;day_padding,</div><div class='del'>-					  width - mitem-&gt;day_padding,</div><div class='del'>-					  height - mitem-&gt;day_padding,</div><div class='del'>-					  &amp;x, &amp;y);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i],</div><div class='del'>-					       "x", x,</div><div class='del'>-					       "y", y,</div><div class='del'>-					       "anchor", mitem-&gt;day_anchor,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Changes the positions and resizes the items in the calendar to match the new size of the</div><div class='del'>- * calendar.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-reshape (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	check_sizes (mitem);</div><div class='del'>-	reanchor (mitem);</div><div class='del'>-	reshape_headings (mitem);</div><div class='del'>-	reshape_days (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the font for all the day headings */</div><div class='del'>-static void</div><div class='del'>-set_head_font (GnomeMonthItem *mitem)</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'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_LABEL + i],</div><div class='del'>-				       "font_gdk", mitem-&gt;head_font,</div><div class='del'>-				       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the color for all the headings */</div><div class='del'>-static void</div><div class='del'>-set_head_color (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GdkColor outline;</div><div class='del'>-	GdkColor head;</div><div class='del'>-</div><div class='del'>-	outline.pixel = mitem-&gt;outline_pixel;</div><div class='del'>-	head.pixel = mitem-&gt;head_pixel;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_BOX + i],</div><div class='del'>-				       "fill_color_gdk", &amp;outline,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_LABEL + i],</div><div class='del'>-				       "fill_color_gdk", &amp;head,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the items for the day name headings */</div><div class='del'>-static void</div><div class='del'>-create_headings (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Just create the items; they will be positioned and configured by a call to reshape() */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		/* Group */</div><div class='del'>-		mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_GROUP + i] =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem),</div><div class='del'>-					       gnome_canvas_group_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-		/* Box */</div><div class='del'>-		mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_BOX + i] =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_GROUP + i]),</div><div class='del'>-					       gnome_canvas_rect_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-		/* Label */</div><div class='del'>-		mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_LABEL + i] =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_GROUP + i]),</div><div class='del'>-					       gnome_canvas_text_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_head_font (mitem);</div><div class='del'>-	set_head_color (mitem);</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 specified year */</div><div class='del'>-static int</div><div class='del'>-leap_years_up_to (int year)</div><div class='del'>-{</div><div class='del'>-	return (year / 4					/* trivial leapness */</div><div class='del'>-		- ((year &gt; 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */</div><div class='del'>-		+ ((year &gt; 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified year is a leap year */</div><div class='del'>-static int</div><div class='del'>-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'>-/* Returns the 1-based day number within the year of the specified date */</div><div class='del'>-static int</div><div class='del'>-day_in_year (int day, int month, int year)</div><div class='del'>-{</div><div class='del'>-	int is_leap, i;</div><div class='del'>-</div><div class='del'>-	is_leap = is_leap_year (year);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; month; i++)</div><div class='del'>-		day += days_in_month [is_leap][i];</div><div class='del'>-</div><div class='del'>-	return day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days</div><div class='del'>- * that were removed on the Gregorian reformation, it returns Thursday.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-day_in_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 + leap_years_up_to (year - 1) + day_in_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'>-/* 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 start_on_monday, 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;</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 = days_in_month[is_leap_year (year)][month];</div><div class='del'>-	d_week = day_in_week (1, month, year);</div><div class='del'>-</div><div class='del'>-	if (start_on_monday)</div><div class='del'>-		d_week = (d_week + 6) % 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'>-/* Set the day numbers in the monthly calendar */</div><div class='del'>-static void</div><div class='del'>-set_days (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int start, end;</div><div class='del'>-	char buf[100];</div><div class='del'>-</div><div class='del'>-	build_month (mitem-&gt;month, mitem-&gt;year, mitem-&gt;start_on_monday, mitem-&gt;day_numbers, &amp;start, &amp;end);</div><div class='del'>-</div><div class='del'>-	/* Clear days before start of month */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; start; i++)</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i],</div><div class='del'>-				       "text", NULL,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	/* Set days of month */</div><div class='del'>-</div><div class='del'>-	for (; start &lt;= end; start++, i++) {</div><div class='del'>-		sprintf (buf, "%d", mitem-&gt;day_numbers[start]);</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i],</div><div class='del'>-				       "text", buf,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear days after end of month */</div><div class='del'>-</div><div class='del'>-	for (; i &lt; 42; i++)</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i],</div><div class='del'>-				       "text", NULL,</div><div class='del'>-				       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the font for all the day numbers */</div><div class='del'>-static void</div><div class='del'>-set_day_font (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++)</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i],</div><div class='del'>-				       "font_gdk", mitem-&gt;day_font,</div><div class='del'>-				       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the color for all the day items */</div><div class='del'>-static void</div><div class='del'>-set_day_color (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GdkColor outline;</div><div class='del'>-	GdkColor day_box;</div><div class='del'>-	GdkColor day;</div><div class='del'>-</div><div class='del'>-	outline.pixel = mitem-&gt;outline_pixel;</div><div class='del'>-	day_box.pixel = mitem-&gt;day_box_pixel;</div><div class='del'>-	day.pixel = mitem-&gt;day_pixel;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++) {</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_BOX + i],</div><div class='del'>-				       "outline_color_gdk", &amp;outline,</div><div class='del'>-				       "fill_color_gdk", &amp;day_box,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i],</div><div class='del'>-				       "fill_color_gdk", &amp;day,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the items for the days */</div><div class='del'>-static void</div><div class='del'>-create_days (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Just create the items; they will be positioned and configured by a call to reshape() */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++) {</div><div class='del'>-		/* Group */</div><div class='del'>-		mitem-&gt;items[GNOME_MONTH_ITEM_DAY_GROUP + i] =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem),</div><div class='del'>-					       gnome_canvas_group_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-		/* Box */</div><div class='del'>-		mitem-&gt;items[GNOME_MONTH_ITEM_DAY_BOX + i] =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_GROUP + i]),</div><div class='del'>-					       gnome_canvas_rect_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-		/* Label */</div><div class='del'>-		mitem-&gt;items[GNOME_MONTH_ITEM_DAY_LABEL + i] =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem-&gt;items[GNOME_MONTH_ITEM_DAY_GROUP + i]),</div><div class='del'>-					       gnome_canvas_text_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_day_font (mitem);</div><div class='del'>-	set_day_color (mitem);</div><div class='del'>-	set_days (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resets the text of the day name headings */</div><div class='del'>-static void</div><div class='del'>-set_day_names (GnomeMonthItem *mitem)</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'>-		gnome_canvas_item_set (mitem-&gt;items[GNOME_MONTH_ITEM_HEAD_LABEL + i],</div><div class='del'>-				       "text", mitem-&gt;day_names[mitem-&gt;start_on_monday ? ((i + 1) % 7) : i],</div><div class='del'>-				       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates all the canvas items that make up the calendar */</div><div class='del'>-static void</div><div class='del'>-create_items (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	mitem-&gt;items = g_new (GnomeCanvasItem *, GNOME_MONTH_ITEM_LAST);</div><div class='del'>-</div><div class='del'>-	create_headings (mitem);</div><div class='del'>-	create_days (mitem);</div><div class='del'>-</div><div class='del'>-	/* Initialize by default to three-letter day names */</div><div class='del'>-</div><div class='del'>-	mitem-&gt;day_names[0] = g_strdup (_("Sun"));</div><div class='del'>-	mitem-&gt;day_names[1] = g_strdup (_("Mon"));</div><div class='del'>-	mitem-&gt;day_names[2] = g_strdup (_("Tue"));</div><div class='del'>-	mitem-&gt;day_names[3] = g_strdup (_("Wed"));</div><div class='del'>-	mitem-&gt;day_names[4] = g_strdup (_("Thu"));</div><div class='del'>-	mitem-&gt;day_names[5] = g_strdup (_("Fri"));</div><div class='del'>-	mitem-&gt;day_names[6] = g_strdup (_("Sat"));</div><div class='del'>-	</div><div class='del'>-	set_day_names (mitem);</div><div class='del'>-	reshape (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_month_item_init (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	/* Initialize to the current month by default */</div><div class='del'>-</div><div class='del'>-	t = time (NULL);</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-	mitem-&gt;year = tm.tm_year + 1900;</div><div class='del'>-	mitem-&gt;month = tm.tm_mon;</div><div class='del'>-</div><div class='del'>-	mitem-&gt;x = 0.0;</div><div class='del'>-	mitem-&gt;y = 0.0;</div><div class='del'>-	mitem-&gt;width = 150.0; /* not unreasonable defaults, I hope */</div><div class='del'>-	mitem-&gt;height = 100.0;</div><div class='del'>-	mitem-&gt;anchor = GTK_ANCHOR_NW;</div><div class='del'>-	mitem-&gt;head_padding = 0.0;</div><div class='del'>-	mitem-&gt;day_padding = 2.0;</div><div class='del'>-	mitem-&gt;head_height = 14.0;</div><div class='del'>-	mitem-&gt;head_anchor = GTK_ANCHOR_CENTER;</div><div class='del'>-	mitem-&gt;day_anchor = GTK_ANCHOR_CENTER;</div><div class='del'>-</div><div class='del'>-	/* Load the default fonts */</div><div class='del'>-</div><div class='del'>-	mitem-&gt;head_font = gdk_font_load (DEFAULT_FONT);</div><div class='del'>-	if (!mitem-&gt;head_font) {</div><div class='del'>-		mitem-&gt;head_font = gdk_font_load ("fixed");</div><div class='del'>-		g_assert (mitem-&gt;head_font != NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mitem-&gt;day_font = gdk_font_load (DEFAULT_FONT);</div><div class='del'>-	if (!mitem-&gt;day_font) {</div><div class='del'>-		mitem-&gt;day_font = gdk_font_load ("fixed");</div><div class='del'>-		g_assert (mitem-&gt;day_font != NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCanvasItem *</div><div class='del'>-gnome_month_item_new (GnomeCanvasGroup *parent)</div><div class='del'>-{</div><div class='del'>-	GnomeMonthItem *mitem;</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 (GNOME_IS_CANVAS_GROUP (parent), NULL);</div><div class='del'>-</div><div class='del'>-	mitem = GNOME_MONTH_ITEM (gnome_canvas_item_new (parent,</div><div class='del'>-							 gnome_month_item_get_type (),</div><div class='del'>-							 NULL));</div><div class='del'>-</div><div class='del'>-	gnome_month_item_construct (mitem);</div><div class='del'>-</div><div class='del'>-	return GNOME_CANVAS_ITEM (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_month_item_construct (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	GdkColor color;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (mitem != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)-&gt;canvas, "#d6d6d6d6d6d6", &amp;color);</div><div class='del'>-	mitem-&gt;head_pixel = color.pixel;</div><div class='del'>-	mitem-&gt;day_box_pixel = color.pixel;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)-&gt;canvas, "black", &amp;color);</div><div class='del'>-	mitem-&gt;outline_pixel = color.pixel;</div><div class='del'>-	mitem-&gt;day_pixel = color.pixel;</div><div class='del'>-</div><div class='del'>-	create_items (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_day_names (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (mitem-&gt;day_names[0])</div><div class='del'>-		for (i = 0; i &lt; 7; i++)</div><div class='del'>-			g_free (mitem-&gt;day_names[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_month_item_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	GnomeMonthItem *mitem;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (object));</div><div class='del'>-</div><div class='del'>-	mitem = GNOME_MONTH_ITEM (object);</div><div class='del'>-</div><div class='del'>-	free_day_names (mitem);</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'>-/* Sets the color of the specified pixel value to that of the specified argument, which must be in</div><div class='del'>- * GdkColor format if format is TRUE, otherwise it must be in string format.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-set_color_arg (GnomeMonthItem *mitem, gulong *pixel, GtkArg *arg, int gdk_format, int set_head, int set_day)</div><div class='del'>-{</div><div class='del'>-	GdkColor color;</div><div class='del'>-</div><div class='del'>-	if (gdk_format)</div><div class='del'>-		*pixel = ((GdkColor *) GTK_VALUE_BOXED (*arg))-&gt;pixel;</div><div class='del'>-	else {</div><div class='del'>-		if (gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)-&gt;canvas, GTK_VALUE_STRING (*arg), &amp;color))</div><div class='del'>-			*pixel = color.pixel;</div><div class='del'>-		else</div><div class='del'>-			*pixel = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_head)</div><div class='del'>-		set_head_color (mitem);</div><div class='del'>-</div><div class='del'>-	if (set_day)</div><div class='del'>-		set_day_color (mitem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeMonthItem *mitem;</div><div class='del'>-	char **day_names;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mitem = GNOME_MONTH_ITEM (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_YEAR:</div><div class='del'>-		mitem-&gt;year = GTK_VALUE_UINT (*arg);</div><div class='del'>-		set_days (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_MONTH:</div><div class='del'>-		mitem-&gt;month = GTK_VALUE_UINT (*arg);</div><div class='del'>-		set_days (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_X:</div><div class='del'>-		mitem-&gt;x = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		reanchor (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_Y:</div><div class='del'>-		mitem-&gt;y = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		reanchor (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		mitem-&gt;width = fabs (GTK_VALUE_DOUBLE (*arg));</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-		mitem-&gt;height = fabs (GTK_VALUE_DOUBLE (*arg));</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_ANCHOR:</div><div class='del'>-		mitem-&gt;anchor = GTK_VALUE_ENUM (*arg);</div><div class='del'>-		reanchor (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_PADDING:</div><div class='del'>-		mitem-&gt;head_padding = fabs (GTK_VALUE_DOUBLE (*arg));</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_PADDING:</div><div class='del'>-		mitem-&gt;day_padding = fabs (GTK_VALUE_DOUBLE (*arg));</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_NAMES:</div><div class='del'>-		day_names = GTK_VALUE_POINTER (*arg);</div><div class='del'>-</div><div class='del'>-		/* First, check that none of the names is null */</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 7; i++)</div><div class='del'>-			if (!day_names[i]) {</div><div class='del'>-				g_warning ("Day number %d was NULL; day names cannot be NULL!", i);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		/* Set the new names */</div><div class='del'>-</div><div class='del'>-		free_day_names (mitem);</div><div class='del'>-		for (i = 0; i &lt; 7; i++)</div><div class='del'>-			mitem-&gt;day_names[i] = g_strdup (day_names[i]);</div><div class='del'>-</div><div class='del'>-		set_day_names (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEADING_HEIGHT:</div><div class='del'>-		mitem-&gt;head_height = fabs (GTK_VALUE_DOUBLE (*arg));</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEADING_ANCHOR:</div><div class='del'>-		mitem-&gt;head_anchor = GTK_VALUE_ENUM (*arg);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_ANCHOR:</div><div class='del'>-		mitem-&gt;day_anchor = GTK_VALUE_ENUM (*arg);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_START_ON_MONDAY:</div><div class='del'>-		mitem-&gt;start_on_monday = GTK_VALUE_BOOL (*arg);</div><div class='del'>-		set_day_names (mitem);</div><div class='del'>-		set_days (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_FONT:</div><div class='del'>-		gdk_font_unref (mitem-&gt;head_font);</div><div class='del'>-</div><div class='del'>-		mitem-&gt;head_font = gdk_font_load (GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (!mitem-&gt;head_font) {</div><div class='del'>-			mitem-&gt;head_font = gdk_font_load ("fixed");</div><div class='del'>-			g_assert (mitem-&gt;head_font != NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_head_font (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_FONTSET:</div><div class='del'>-		gdk_font_unref (mitem-&gt;head_font);</div><div class='del'>-</div><div class='del'>-		mitem-&gt;head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (!mitem-&gt;head_font) {</div><div class='del'>-			mitem-&gt;head_font =</div><div class='del'>-			  gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*");</div><div class='del'>-			g_assert (mitem-&gt;head_font != NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_head_font (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_FONT_GDK:</div><div class='del'>-		gdk_font_unref (mitem-&gt;head_font);</div><div class='del'>-</div><div class='del'>-		mitem-&gt;head_font = GTK_VALUE_BOXED (*arg);</div><div class='del'>-		gdk_font_ref (mitem-&gt;head_font);</div><div class='del'>-		set_head_font (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_FONT:</div><div class='del'>-		gdk_font_unref (mitem-&gt;day_font);</div><div class='del'>-</div><div class='del'>-		mitem-&gt;day_font = gdk_font_load (GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (!mitem-&gt;day_font) {</div><div class='del'>-			mitem-&gt;day_font = gdk_font_load ("fixed");</div><div class='del'>-			g_assert (mitem-&gt;day_font != NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_day_font (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_FONTSET:</div><div class='del'>-		gdk_font_unref (mitem-&gt;day_font);</div><div class='del'>-</div><div class='del'>-		mitem-&gt;day_font = gdk_fontset_load (GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (!mitem-&gt;day_font) {</div><div class='del'>-			mitem-&gt;day_font =</div><div class='del'>-			  gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*");</div><div class='del'>-			g_assert (mitem-&gt;day_font != NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_day_font (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_FONT_GDK:</div><div class='del'>-		gdk_font_unref (mitem-&gt;day_font);</div><div class='del'>-</div><div class='del'>-		mitem-&gt;day_font = GTK_VALUE_BOXED (*arg);</div><div class='del'>-		gdk_font_ref (mitem-&gt;day_font);</div><div class='del'>-		set_day_font (mitem);</div><div class='del'>-		reshape (mitem);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_COLOR:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;head_pixel, arg, FALSE, TRUE, FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_COLOR_GDK:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;head_pixel, arg, TRUE, TRUE, FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_OUTLINE_COLOR:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;outline_pixel, arg, FALSE, TRUE, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_OUTLINE_COLOR_GDK:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;outline_pixel, arg, TRUE, TRUE, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_BOX_COLOR:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;day_box_pixel, arg, FALSE, FALSE, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_BOX_COLOR_GDK:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;day_box_pixel, arg, TRUE, FALSE, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_COLOR:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;day_pixel, arg, FALSE, FALSE, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_COLOR_GDK:</div><div class='del'>-		set_color_arg (mitem, &amp;mitem-&gt;day_pixel, arg, TRUE, FALSE, 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'>-</div><div class='del'>-/* Allocates a GdkColor structure filled with the specified pixel, and puts it into the specified</div><div class='del'>- * arg for returning it in the get_arg method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-get_color_arg (GnomeMonthItem *mitem, gulong pixel, GtkArg *arg)</div><div class='del'>-{</div><div class='del'>-	GdkColor *color;</div><div class='del'>-</div><div class='del'>-	color = g_new (GdkColor, 1);</div><div class='del'>-	color-&gt;pixel = pixel;</div><div class='del'>-	gdk_color_context_query_color (GNOME_CANVAS_ITEM (mitem)-&gt;canvas-&gt;cc, color);</div><div class='del'>-	GTK_VALUE_BOXED (*arg) = color;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_month_item_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeMonthItem *mitem;</div><div class='del'>-</div><div class='del'>-	mitem = GNOME_MONTH_ITEM (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_YEAR:</div><div class='del'>-		GTK_VALUE_UINT (*arg) = mitem-&gt;year;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_MONTH:</div><div class='del'>-		GTK_VALUE_UINT (*arg) = mitem-&gt;month;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_X:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = mitem-&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) = mitem-&gt;y;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = mitem-&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) = mitem-&gt;height;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_ANCHOR:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = mitem-&gt;anchor;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_PADDING:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = mitem-&gt;head_padding;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_PADDING:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = mitem-&gt;day_padding;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEADING_HEIGHT:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = mitem-&gt;head_height;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEADING_ANCHOR:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = mitem-&gt;head_anchor;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_ANCHOR:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = mitem-&gt;day_anchor;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_START_ON_MONDAY:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = mitem-&gt;start_on_monday;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_FONT_GDK:</div><div class='del'>-		GTK_VALUE_BOXED (*arg) = mitem-&gt;head_font;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_FONT_GDK:</div><div class='del'>-		GTK_VALUE_BOXED (*arg) = mitem-&gt;day_font;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_HEAD_COLOR_GDK:</div><div class='del'>-		get_color_arg (mitem, mitem-&gt;head_pixel, arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_OUTLINE_COLOR_GDK:</div><div class='del'>-		get_color_arg (mitem, mitem-&gt;outline_pixel, arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_BOX_COLOR_GDK:</div><div class='del'>-		get_color_arg (mitem, mitem-&gt;day_box_pixel, arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_DAY_COLOR_GDK:</div><div class='del'>-		get_color_arg (mitem, mitem-&gt;day_pixel, arg);</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'>-GnomeCanvasItem *</div><div class='del'>-gnome_month_item_num2child (GnomeMonthItem *mitem, int child_num)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (mitem != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), NULL);</div><div class='del'>-</div><div class='del'>-	return mitem-&gt;items[child_num];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-gnome_month_item_child2num (GnomeMonthItem *mitem, GnomeCanvasItem *child)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (mitem != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), -1);</div><div class='del'>-	g_return_val_if_fail (child != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (child), -1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; GNOME_MONTH_ITEM_LAST; i++)</div><div class='del'>-		if (mitem-&gt;items[i] == child)</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'>-int</div><div class='del'>-gnome_month_item_num2day (GnomeMonthItem *mitem, int child_num)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (mitem != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), 0);</div><div class='del'>-</div><div class='del'>-	if ((child_num &gt;= GNOME_MONTH_ITEM_DAY_GROUP) &amp;&amp; (child_num &lt; GNOME_MONTH_ITEM_LAST)) {</div><div class='del'>-		child_num = (child_num - GNOME_MONTH_ITEM_DAY_GROUP) % 42;</div><div class='del'>-		return mitem-&gt;day_numbers[child_num];</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-gnome_month_item_day2index (GnomeMonthItem *mitem, int day_num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (mitem != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), -1);</div><div class='del'>-	g_return_val_if_fail (day_num &gt;= 1, -1);</div><div class='del'>-</div><div class='del'>-	/* Find first day of month */</div><div class='del'>-</div><div class='del'>-	for (i = 0; mitem-&gt;day_numbers[i] == 0; i++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	/* Find the specified day */</div><div class='del'>-</div><div class='del'>-	for (; (mitem-&gt;day_numbers[i] != 0) &amp;&amp; (i &lt; 42); i++)</div><div class='del'>-		if (mitem-&gt;day_numbers[i] == day_num)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	/* Bail out */</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/gnome-month-item.h b/calendar/gui/gnome-month-item.h<br/>deleted file mode 100644<br/>index 0ec4fd484c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-month-item.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnome-month-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,165 +0,0 @@</div><div class='del'>-/* General-purpose monthly calendar canvas item for GNOME</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat Software, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef GNOME_MONTH_ITEM_H</div><div class='del'>-#define GNOME_MONTH_ITEM_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkpacker.h&gt; /* why the hell is GtkAnchorType here and not in gtkenums.h? */</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These values are used to identify the canvas items that make up a complete GnomeMonthItem, which</div><div class='del'>- * is made up of the following "pieces":</div><div class='del'>- *</div><div class='del'>- *	Headings line:</div><div class='del'>- *		- 7 GnomeCanvasGroups:</div><div class='del'>- *			Each group contains one box (GnomeCanvasRectangle) and one label</div><div class='del'>- *			(GnomeCanvasText)</div><div class='del'>- *</div><div class='del'>- *	Day slots:</div><div class='del'>- *		- 42 GnomeCanvasGroups:</div><div class='del'>- *			Each group contains one box (GnomeCanvasRectangle) and one label</div><div class='del'>- *			(GnomeCanvasText)</div><div class='del'>- *</div><div class='del'>- * The headings are organized from left to right.  The day slots are organized as a table in</div><div class='del'>- * row-major order.</div><div class='del'>- *</div><div class='del'>- * If you want to access the individual items of the GnomeMonthItem, you can use these numbers with</div><div class='del'>- * the gnome_month_item_num2child() function.  If you want to convert a number into the</div><div class='del'>- * corresponding GnomeCanvasItem, you can use the gnome_month_item_child2num() function.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	GNOME_MONTH_ITEM_HEAD_GROUP = 0,	/* 7 groups for headings */</div><div class='del'>-	GNOME_MONTH_ITEM_HEAD_BOX   = 7,	/* 7 boxes for headings */</div><div class='del'>-	GNOME_MONTH_ITEM_HEAD_LABEL = 14,	/* 7 labels for headings */</div><div class='del'>-	GNOME_MONTH_ITEM_DAY_GROUP  = 21,	/* 42 groups for days */</div><div class='del'>-	GNOME_MONTH_ITEM_DAY_BOX    = 63,	/* 42 boxes for days */</div><div class='del'>-	GNOME_MONTH_ITEM_DAY_LABEL  = 105,	/* 42 labels for days */</div><div class='del'>-	GNOME_MONTH_ITEM_LAST       = 147	/* total number of items */</div><div class='del'>-} GnomeMonthItemChild;</div><div class='del'>-</div><div class='del'>-/* The MonthItem canvas item defines a simple monthly calendar.  It is made out of a number of</div><div class='del'>- * canvas items, which can be accessed using the functions provided.  The monthly calendar is</div><div class='del'>- * anchored with respect to a point.  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'>- * year			uint		RW		Full year (1-9999)</div><div class='del'>- * month		uint		RW		Number of month (0-11)</div><div class='del'>- * x			double		RW		X position of anchor point</div><div class='del'>- * y			double		RW		Y position of anchor point</div><div class='del'>- * width		double		RW		Width of calendar in canvas units</div><div class='del'>- * height		double		RW		Height of calendar in canvas units</div><div class='del'>- * anchor		GtkAnchorType	RW		Anchor side for calendar</div><div class='del'>- * heading_padding	double		RW		Padding inside heading boxes</div><div class='del'>- * day_padding		double		RW		Padding inside day boxes</div><div class='del'>- * day_names		char **		W		Array of strings corresponding to the day names (sun-sat)</div><div class='del'>- * heading_height	double		RW		Height of headings bar in canvas units</div><div class='del'>- * heading_anchor	GtkAnchorType	RW		Anchor side for headings inside heading boxes</div><div class='del'>- * day_anchor		GtkAnchorType	RW		Anchor side for day numbers inside day boxes</div><div class='del'>- * start_on_monday	boolean		RW		Specifies whether the week starts on Monday or Sunday</div><div class='del'>- * heading_font		string		W		X logical font descriptor for the headings</div><div class='del'>- * heading_fontset     	string		W		X logical fontset descriptor for the headings</div><div class='del'>- * heading_font_gdk	GdkFont *	RW		Pointer to GdkFont for the headings</div><div class='del'>- * day_font		string		W		X logical font descriptor for the day numbers</div><div class='del'>- * day_fontset 		string		W		X logical fontset descriptor for the day numbers</div><div class='del'>- * day_font_gdk		GdkFont *	RW		Pointer to GdkFont for the day numbers</div><div class='del'>- * heading_color	string		W		X color specification for heading labels</div><div class='del'>- * heading_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for heading labels</div><div class='del'>- * outline_color	string		W		X color specification for outline (lines and fill of heading boxes)</div><div class='del'>- * outline_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for outline</div><div class='del'>- * day_box_color	string		W		X color specification for day boxes</div><div class='del'>- * day_box_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for day boxes</div><div class='del'>- * day_color		string		W		X color specification for day number labels</div><div class='del'>- * day_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for day number labels</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define GNOME_TYPE_MONTH_ITEM            (gnome_month_item_get_type ())</div><div class='del'>-#define GNOME_MONTH_ITEM(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_MONTH_ITEM, GnomeMonthItem))</div><div class='del'>-#define GNOME_MONTH_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MONTH_ITEM, GnomeMonthItemClass))</div><div class='del'>-#define GNOME_IS_MONTH_ITEM(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MONTH_ITEM))</div><div class='del'>-#define GNOME_IS_MONTH_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MONTH_ITEM))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _GnomeMonthItem GnomeMonthItem;</div><div class='del'>-typedef struct _GnomeMonthItemClass GnomeMonthItemClass;</div><div class='del'>-</div><div class='del'>-struct _GnomeMonthItem {</div><div class='del'>-	GnomeCanvasGroup group;</div><div class='del'>-</div><div class='del'>-	int year;			/* Year to show (full, no two-digit crap) */</div><div class='del'>-	int month;			/* Month to show (0-11) */</div><div class='del'>-</div><div class='del'>-	double x, y;			/* Position at anchor */</div><div class='del'>-	double width, height;		/* Size of calendar */</div><div class='del'>-	GtkAnchorType anchor;		/* Anchor side for calendar */</div><div class='del'>-</div><div class='del'>-	double head_padding;		/* Padding to use between heading lines and text */</div><div class='del'>-	double day_padding;		/* Padding to use between day number lines and text */</div><div class='del'>-</div><div class='del'>-	char *day_names[7];		/* Names to use for the day labels, starting from Sunday */</div><div class='del'>-</div><div class='del'>-	double head_height;		/* Height of the headings row */</div><div class='del'>-	GtkAnchorType head_anchor;	/* Anchor side for the heading labels */</div><div class='del'>-	GtkAnchorType day_anchor;	/* Anchor side for the day number labels */</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem **items;	/* All the items that make up the calendar */</div><div class='del'>-	int day_numbers[42];		/* The numbers of the days, as they are shown in the display */</div><div class='del'>-</div><div class='del'>-	GdkFont *head_font;		/* Font for the headings */</div><div class='del'>-	GdkFont *day_font;		/* Font for the day numbers */</div><div class='del'>-</div><div class='del'>-	gulong head_pixel;		/* Color for heading labels */</div><div class='del'>-	gulong outline_pixel;		/* Color for the outline (lines and heading boxes) */</div><div class='del'>-	gulong day_box_pixel;		/* Color for the day boxes */</div><div class='del'>-	gulong day_pixel;		/* Color for day number labels */</div><div class='del'>-</div><div class='del'>-	int start_on_monday : 1;	/* Start the week on Monday?  If false, then start from Sunday */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _GnomeMonthItemClass {</div><div class='del'>-	GnomeCanvasGroupClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType gnome_month_item_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Creates a new month item with the specified group as parent */</div><div class='del'>-GnomeCanvasItem *gnome_month_item_new (GnomeCanvasGroup *parent);</div><div class='del'>-</div><div class='del'>-/* Constructor function useful for derived classes */</div><div class='del'>-void gnome_month_item_construct (GnomeMonthItem *mitem);</div><div class='del'>-</div><div class='del'>-/* Returns the child item defined by the child number (as specified on the GnomeMonthItemChild</div><div class='del'>- * enumeration above).</div><div class='del'>- */</div><div class='del'>-GnomeCanvasItem *gnome_month_item_num2child (GnomeMonthItem *mitem, int child_num);</div><div class='del'>-</div><div class='del'>-/* Returns the number of the specified child item, as defined on the GnomeMonthItemChild enumeration</div><div class='del'>- * above.  If the specified object is not found, it returns -1.</div><div class='del'>- */</div><div class='del'>-int gnome_month_item_child2num (GnomeMonthItem *mitem, GnomeCanvasItem *child);</div><div class='del'>-</div><div class='del'>-/* Returns the number of the day relevant to the specified child item.  Day numbers are 1-based.  If</div><div class='del'>- * the specified child is outside the range of displayed days, then it returns 0.</div><div class='del'>- */</div><div class='del'>-int gnome_month_item_num2day (GnomeMonthItem *mitem, int child_num);</div><div class='del'>-</div><div class='del'>-/* Returns the index (0-41) of the specified date within the table of days.  If the day number is</div><div class='del'>- * invalid for the current monthly calendar, then -1 is returned.</div><div class='del'>- */</div><div class='del'>-int gnome_month_item_day2index (GnomeMonthItem *mitem, int day_num);</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/gnomecal.gnorba b/calendar/gui/gnomecal.gnorba<br/>deleted file mode 100644<br/>index 74df8ecf04..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnomecal.gnorba?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnomecal.gnorba</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-[IDL:GNOME:Calendar:Repository:1.0]</div><div class='del'>-type=factory</div><div class='del'>-repo_id=IDL:Gnome/Calendar/Repository:1.0</div><div class='del'>-description=Calendar Repository</div><div class='del'>-location_info=IDL:GNOME:Calendar:RepositoryLocator:1.0</div><div class='del'>-</div><div class='del'>-[IDL:GNOME:Calendar:RepositoryLocator:1.0]</div><div class='del'>-type=exe</div><div class='del'>-repo_id=IDL:GNOME/GenericFactory:1.0</div><div class='del'>-description=Calendar Server</div><div class='del'>-location_info=gnomecal</div><div class='head'>diff --git a/calendar/gui/gnomecal.oafinfo b/calendar/gui/gnomecal.oafinfo<br/>deleted file mode 100644<br/>index c4b91b9dd8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnomecal.oafinfo?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/gnomecal.oafinfo</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:IDL:GNOME:Calendar:Repository:1.0:56989bb6-65a1-430c-86a8-81bbe64bf7ab"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"&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/Calendar/Repository: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="Calendar Repository"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="gnomecal"&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="Calendar Server"/&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/goto.c b/calendar/gui/goto.c<br/>deleted file mode 100644<br/>index d6c69016a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/goto.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/goto.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,326 +0,0 @@</div><div class='del'>-/* Go to date dialog for gnomecal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat Software, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;federico@nuclecu.unam.mx&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;cal-util/timeutil.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "gnome-month-item.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "mark.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkWidget *goto_win;		/* The goto dialog window */</div><div class='del'>-static GnomeMonthItem *month_item;	/* The month item in the dialog */</div><div class='del'>-static GnomeCalendar *gnome_calendar;	/* The gnome calendar the dialog refers to */</div><div class='del'>-static int current_index;		/* The index of the day marked as current, or -1 if none */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Updates the specified month item by marking it appropriately from the calendar the dialog refers</div><div class='del'>- * to.  Also marks the current day if appropriate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-update (void)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	time_t t;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	unmark_month_item (month_item);</div><div class='del'>-	mark_month_item (month_item, gnome_calendar);</div><div class='del'>-</div><div class='del'>-	if (current_index != -1) {</div><div class='del'>-		item = gnome_month_item_num2child (month_item,</div><div class='del'>-						   GNOME_MONTH_ITEM_DAY_LABEL + current_index);</div><div class='del'>-		gnome_canvas_item_set (item,</div><div class='del'>-				       "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG),</div><div class='del'>-				       "fontset", NORMAL_DAY_FONTSET,</div><div class='del'>-				       NULL);</div><div class='del'>-		current_index = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t = time (NULL);</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-	if (((tm.tm_year + 1900) == month_item-&gt;year) &amp;&amp; (tm.tm_mon == month_item-&gt;month)) {</div><div class='del'>-		current_index = gnome_month_item_day2index (month_item, tm.tm_mday);</div><div class='del'>-		g_assert (current_index != -1);</div><div class='del'>-</div><div class='del'>-		item = gnome_month_item_num2child (month_item,</div><div class='del'>-						   GNOME_MONTH_ITEM_DAY_LABEL + current_index);</div><div class='del'>-		gnome_canvas_item_set (item,</div><div class='del'>-				       "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG),</div><div class='del'>-				       "fontset", CURRENT_DAY_FONTSET,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-}</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'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),</div><div class='del'>-			       "year", (int) adj-&gt;value,</div><div class='del'>-			       NULL);</div><div class='del'>-	update ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the year control with its adjustment */</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_year (int year)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("Year:"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (year, 1900, 9999, 1, 10, 10));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",</div><div class='del'>-			    (GtkSignalFunc) year_changed,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	w = gtk_spin_button_new (adj, 1.0, 0);</div><div class='del'>-	gtk_widget_set_usize (w, 60, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	return hbox;</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_toggled (GtkToggleButton *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (!toggle-&gt;active)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),</div><div class='del'>-			       "month", GPOINTER_TO_INT (data),</div><div class='del'>-			       NULL);</div><div class='del'>-	update ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the months control */</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_months (int month)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GSList *group;</div><div class='del'>-	int i, row, col;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	char buf[100];</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;gnome_calendar-&gt;selection_start_time);</div><div class='del'>-</div><div class='del'>-	table = gtk_table_new (2, 6, TRUE);</div><div class='del'>-</div><div class='del'>-	group = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 12; i++) {</div><div class='del'>-		row = i / 6;</div><div class='del'>-		col = i % 6;</div><div class='del'>-</div><div class='del'>-		tm.tm_mon = i;</div><div class='del'>-		strftime (buf, 100, "%b", &amp;tm);</div><div class='del'>-</div><div class='del'>-		w = gtk_radio_button_new (group);</div><div class='del'>-		group = gtk_radio_button_group (GTK_RADIO_BUTTON (w));</div><div class='del'>-		gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (w), FALSE);</div><div class='del'>-</div><div class='del'>-		gtk_container_add (GTK_CONTAINER (w), gtk_label_new (buf));</div><div class='del'>-</div><div class='del'>-		if (i == month)</div><div class='del'>-			gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (w), TRUE);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (w), "toggled",</div><div class='del'>-				    (GtkSignalFunc) month_toggled,</div><div class='del'>-				    GINT_TO_POINTER (i));</div><div class='del'>-		gtk_table_attach (GTK_TABLE (table), w,</div><div class='del'>-				  col, col + 1,</div><div class='del'>-				  row, row + 1,</div><div class='del'>-				  GTK_EXPAND | GTK_FILL,</div><div class='del'>-				  GTK_EXPAND | GTK_FILL,</div><div class='del'>-				  0, 0);</div><div class='del'>-		gtk_widget_show_all (w);</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'>-/* Sets the scrolling region of the canvas to the allocation size */</div><div class='del'>-static void</div><div class='del'>-set_scroll_region (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),</div><div class='del'>-			       "width", (double) (allocation-&gt;width - 1),</div><div class='del'>-			       "height", (double) (allocation-&gt;height - 1),</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (widget),</div><div class='del'>-					0, 0,</div><div class='del'>-					allocation-&gt;width, allocation-&gt;height);</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 gint</div><div class='del'>-day_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int child_num, day;</div><div class='del'>-</div><div class='del'>-	child_num = gnome_month_item_child2num (month_item, item);</div><div class='del'>-	day = gnome_month_item_num2day (month_item, child_num);</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) &amp;&amp; (day != 0)) {</div><div class='del'>-			gnome_calendar_goto (gnome_calendar,</div><div class='del'>-					     time_from_day (month_item-&gt;year, month_item-&gt;month, day));</div><div class='del'>-			gtk_widget_destroy (goto_win);</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'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the canvas with the month item for selecting days */</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_days (int day, int month, int year)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *canvas;</div><div class='del'>-	int i;</div><div class='del'>-	GnomeCanvasItem *day_group;</div><div class='del'>-</div><div class='del'>-	canvas = gnome_canvas_new ();</div><div class='del'>-	gtk_widget_set_usize (canvas, 150, 120);</div><div class='del'>-</div><div class='del'>-	month_item = GNOME_MONTH_ITEM (gnome_month_item_new (gnome_canvas_root (GNOME_CANVAS (canvas))));</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),</div><div class='del'>-			       "month", month,</div><div class='del'>-			       "year", year,</div><div class='del'>-			       "start_on_monday", week_starts_on_monday,</div><div class='del'>-			       NULL);</div><div class='del'>-	colorify_month_item (month_item, default_color_func, NULL);</div><div class='del'>-	month_item_prepare_prelight (month_item, default_color_func, NULL);</div><div class='del'>-	update ();</div><div class='del'>-</div><div class='del'>-	/* Connect to size_allocate so that we can change the size of the month item and the</div><div class='del'>-	 * scrolling region appropriately.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",</div><div class='del'>-			    (GtkSignalFunc) set_scroll_region,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	/* Bind the day groups to our event handler */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++) {</div><div class='del'>-		day_group = gnome_month_item_num2child (month_item, i + GNOME_MONTH_ITEM_DAY_GROUP);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (day_group), "event",</div><div class='del'>-				    (GtkSignalFunc) day_event,</div><div class='del'>-				    NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return canvas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-goto_today (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gnome_calendar_goto_today (gnome_calendar);</div><div class='del'>-	gtk_widget_destroy (goto_win);</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 *vbox;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GtkWidget *days;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	gnome_calendar = gcal;</div><div class='del'>-	current_index = -1;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;gnome_calendar-&gt;selection_start_time);</div><div class='del'>-</div><div class='del'>-	goto_win = gnome_dialog_new (_("Go to date"),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-				     NULL);</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (goto_win),</div><div class='del'>-		 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	vbox = GNOME_DIALOG (goto_win)-&gt;vbox;</div><div class='del'>-</div><div class='del'>-	/* Instructions */</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("Please select the date you want to go to.\n"</div><div class='del'>-			     "When you click on a day, you will be taken\n"</div><div class='del'>-			     "to that date."));</div><div class='del'>-	gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Create month item before creating the year controls, since the</div><div class='del'>-	 * latter ones need the month_item to be created.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	days = create_days (tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);</div><div class='del'>-</div><div class='del'>-	/* Year */</div><div class='del'>-</div><div class='del'>-	w = create_year (tm.tm_year + 1900);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Month */</div><div class='del'>-</div><div class='del'>-	w = create_months (tm.tm_mon);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Days (canvas with month item) */</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), days, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (days);</div><div class='del'>-</div><div class='del'>-	/* Today button */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-	w = gtk_button_new_with_label (_("Go to today"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "clicked",</div><div class='del'>-			    (GtkSignalFunc) goto_today,</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	/* Run! */</div><div class='del'>-</div><div class='del'>-	gtk_window_set_modal (GTK_WINDOW (goto_win), TRUE);</div><div class='del'>-	gnome_dialog_set_close (GNOME_DIALOG (goto_win), TRUE);</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (goto_win),</div><div class='del'>-	  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gnome_calendar))));</div><div class='del'>-	gtk_widget_show (goto_win);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/icalendar-types b/calendar/gui/icalendar-types<br/>deleted file mode 100644<br/>index e11f4c1789..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/icalendar-types?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/icalendar-types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-evento			 todo	      journal	   fbrequest	    fbreply  busytime  timezone</div><div class='del'>-	attach		 attach	      attach</div><div class='del'>-	attendee	 attendee     attendee	   attendee	    attendee attendee</div><div class='del'>-	categories	 categories   categories</div><div class='del'>-	class		 class	      class</div><div class='del'>-	comment		 comment      comment	   comment	    comment  comment   comment</div><div class='del'>-			 completed</div><div class='del'>-	contact		 contact      contact</div><div class='del'>-	created		 created      created			    created</div><div class='del'>-	description	 description  description</div><div class='del'>-			 dtstamp      dtstamp</div><div class='del'>-	dtend/duration	 due-&gt;dtend		   dtend [duration] dtend    dtend</div><div class='del'>-	dtstart		 dtstart      dtstart	   dtstart	    dtstart  dtstart   dtstart</div><div class='del'>-	exdate		 exdate	      exdate</div><div class='del'>-	exrule		 exrule	      exrule</div><div class='del'>-	geo		 geo</div><div class='del'>-	last-mod	 last-mod     last-mod	   last-mod	    last-mod</div><div class='del'>-	location	 location</div><div class='del'>-	organizer	 organizer    organizer</div><div class='del'>-			 percent</div><div class='del'>-	priority	 priority</div><div class='del'>-	rstatus		 rstatus      rstatus			    rstatus</div><div class='del'>-	related		 related      related</div><div class='del'>-	resources	 resources</div><div class='del'>-	rdate		 rdate	      rdate					       [rdate/rrule]</div><div class='del'>-	rrule		 rrule	      rrule</div><div class='del'>-	dtstamp					   dtstamp	    dtstamp  dtstamp</div><div class='del'>-	seq		 seq	      seq	   seq		    seq</div><div class='del'>-	status		 status</div><div class='del'>-	summary		 summary      summary</div><div class='del'>-	transp</div><div class='del'>-	uid		 uid	      uid	   uid		    uid</div><div class='del'>-	url		 url	      url			    url	     url</div><div class='del'>-	recurid		 recurid      recurid</div><div class='del'>-								    freebusy freebusy</div><div class='del'>-										       tzname</div><div class='del'>-										       tzoffset-to</div><div class='del'>-										       tzoffset-from</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/jump.xpm b/calendar/gui/jump.xpm<br/>deleted file mode 100644<br/>index d974142d9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/jump.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/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/calendar/gui/layout.c b/calendar/gui/layout.c<br/>deleted file mode 100644<br/>index c8dfde6bdb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/layout.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/layout.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,309 +0,0 @@</div><div class='del'>-/* Evolution calendar - Event layout engine</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include "layout.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This structure is used to pass around layout information among the internal</div><div class='del'>- * layout functions.</div><div class='del'>- */</div><div class='del'>-struct layout_info {</div><div class='del'>-	GList *events;			/* List of events from client */</div><div class='del'>-	int num_events;			/* The number of events (length of the list) */</div><div class='del'>-	LayoutQueryTimeFunc func;	/* Function to convert a list item to a start/end time pair */</div><div class='del'>-	int num_rows;			/* Size of the time partition */</div><div class='del'>-	time_t *partition;		/* The time partition containing start and end time values */</div><div class='del'>-	int *array;			/* Working array of free and allocated time slots */</div><div class='del'>-	int *allocations;		/* Returned array of slot allocations */</div><div class='del'>-	int *slots;			/* Returned array of slots used */</div><div class='del'>-	int num_slots;			/* Number of slots used */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This defines the maximum number of events to overlap per row.  More than that</div><div class='del'>- * number of events will not be displayed.  This is not ideal, so sue me.</div><div class='del'>- */</div><div class='del'>-#define MAX_EVENTS_PER_ROW 32</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Compares two time_t values, used for qsort() */</div><div class='del'>-static int</div><div class='del'>-compare_time_t (const void *a, const void *b)</div><div class='del'>-{</div><div class='del'>-	time_t ta, tb;</div><div class='del'>-</div><div class='del'>-	ta = *((time_t *) a);</div><div class='del'>-	tb = *((time_t *) b);</div><div class='del'>-</div><div class='del'>-	if (ta &lt; tb)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (ta &gt; tb)</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'>-/* Builds a partition of the time range occupied by the events in the list.  It returns an array</div><div class='del'>- * with the times that define the partition and the number of items in the partition.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-build_partition (struct layout_info *li)</div><div class='del'>-{</div><div class='del'>-	time_t *rows, *p, *q;</div><div class='del'>-	GList *list;</div><div class='del'>-	int i, unique_vals;</div><div class='del'>-</div><div class='del'>-	/* This is the maximum number of rows we would need */</div><div class='del'>-</div><div class='del'>-	li-&gt;num_rows = li-&gt;num_events * 2;</div><div class='del'>-</div><div class='del'>-	/* Fill the rows with the times */</div><div class='del'>-</div><div class='del'>-	rows = g_new (time_t, li-&gt;num_rows);</div><div class='del'>-</div><div class='del'>-	for (list = li-&gt;events, p = rows; list; list = list-&gt;next) {</div><div class='del'>-		(* li-&gt;func) (list, &amp;p[0], &amp;p[1]);</div><div class='del'>-		p += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do a sort | uniq on the array */</div><div class='del'>-</div><div class='del'>-	qsort (rows, li-&gt;num_rows, sizeof (time_t), compare_time_t);</div><div class='del'>-</div><div class='del'>-	p = rows;</div><div class='del'>-	q = rows + 1;</div><div class='del'>-	unique_vals = 1;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; li-&gt;num_rows; i++, q++)</div><div class='del'>-		if (*q != *p) {</div><div class='del'>-			unique_vals++;</div><div class='del'>-			p++;</div><div class='del'>-			*p = *q;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	/* Return the number of unique values in the partition and the partition array itself */</div><div class='del'>-</div><div class='del'>-	li-&gt;num_rows = unique_vals;</div><div class='del'>-	li-&gt;partition = rows;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the index of the element in the partition that corresponds to the specified time */</div><div class='del'>-static int</div><div class='del'>-find_index (struct layout_info *li, time_t t)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; ; i++)</div><div class='del'>-		if (li-&gt;partition[i] == t)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define xy(li, x, y) li-&gt;array[(y * MAX_EVENTS_PER_ROW) + (x)]</div><div class='del'>-</div><div class='del'>-/* Checks that all the cells in the slot array at the specified slot column are free to use by an</div><div class='del'>- * event that has the specified range.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-range_is_empty (struct layout_info *li, int slot, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = find_index (li, start); li-&gt;partition[i] &lt; end; i++)</div><div class='del'>-		if (xy (li, slot, i) != -1)</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'>-/* Allocates a time in the slot array for the specified event's index */</div><div class='del'>-static void</div><div class='del'>-range_allocate (struct layout_info *li, int slot, time_t start, time_t end, int ev_num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = find_index (li, start); li-&gt;partition[i] &lt; end; i++)</div><div class='del'>-		xy (li, slot, i) = ev_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Performs the initial allocation of slots for events.  Each event gets one column; they will be</div><div class='del'>- * expanded in a later stage.  Returns the number of columns used.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-initial_allocate (struct layout_info *li)</div><div class='del'>-{</div><div class='del'>-	GList *events;</div><div class='del'>-	int i;</div><div class='del'>-	int slot;</div><div class='del'>-	int num_slots;</div><div class='del'>-	time_t start, end;</div><div class='del'>-</div><div class='del'>-	num_slots = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0, events = li-&gt;events; events; events = events-&gt;next, i++) {</div><div class='del'>-		(* li-&gt;func) (events, &amp;start, &amp;end);</div><div class='del'>-</div><div class='del'>-		/* Start with no allocation, no columns */</div><div class='del'>-</div><div class='del'>-		li-&gt;allocations[i] = -1;</div><div class='del'>-		li-&gt;slots[i] = 0;</div><div class='del'>-</div><div class='del'>-		/* Find a free column for the event */</div><div class='del'>-</div><div class='del'>-		for (slot = 0; slot &lt; MAX_EVENTS_PER_ROW; slot++)</div><div class='del'>-			if (range_is_empty (li, slot, start, end)) {</div><div class='del'>-				range_allocate (li, slot, start, end, i);</div><div class='del'>-</div><div class='del'>-				li-&gt;allocations[i] = slot;</div><div class='del'>-				li-&gt;slots[i] = 1;</div><div class='del'>-</div><div class='del'>-				if ((slot + 1) &gt; num_slots)</div><div class='del'>-					num_slots = slot + 1;</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'>-	li-&gt;num_slots = num_slots;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the maximum number of columns that an event can expanded by in the slot array */</div><div class='del'>-static int</div><div class='del'>-columns_to_expand (struct layout_info *li, int ev_num, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	int cols;</div><div class='del'>-	int slot;</div><div class='del'>-	int i_start;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cols = 0;</div><div class='del'>-</div><div class='del'>-	i_start = find_index (li, start);</div><div class='del'>-</div><div class='del'>-	for (slot = li-&gt;allocations[ev_num] + 1; slot &lt; li-&gt;num_slots; slot++) {</div><div class='del'>-		for (i = i_start; li-&gt;partition[i] &lt; end; i++)</div><div class='del'>-			if (xy (li, slot, i) != -1)</div><div class='del'>-				return cols;</div><div class='del'>-</div><div class='del'>-		cols++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cols;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Expands an event by the specified number of columns */</div><div class='del'>-static void</div><div class='del'>-do_expansion (struct layout_info *li, int ev_num, time_t start, time_t end, int num_cols)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	int slot;</div><div class='del'>-</div><div class='del'>-	for (i = find_index (li, start); li-&gt;partition[i] &lt; end; i++) {</div><div class='del'>-		slot = li-&gt;allocations[ev_num] + 1;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; num_cols; j++)</div><div class='del'>-			xy (li, slot + j, i) = ev_num;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Expands the events in the slot array to occupy as many columns as possible.  This is the second</div><div class='del'>- * pass of the layout algorithm.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-expand_events (struct layout_info *li)</div><div class='del'>-{</div><div class='del'>-	GList *events;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	int i;</div><div class='del'>-	int cols;</div><div class='del'>-</div><div class='del'>-	for (i = 0, events = li-&gt;events; events; events = events-&gt;next, i++) {</div><div class='del'>-		(* li-&gt;func) (events, &amp;start, &amp;end);</div><div class='del'>-</div><div class='del'>-		cols = columns_to_expand (li, i, start, end);</div><div class='del'>-</div><div class='del'>-		if (cols == 0)</div><div class='del'>-			continue; /* We can't expand this event */</div><div class='del'>-</div><div class='del'>-		do_expansion (li, i, start, end, cols);</div><div class='del'>-</div><div class='del'>-		li-&gt;slots[i] += cols;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-layout_events (GList *events, LayoutQueryTimeFunc func,</div><div class='del'>-	       int *num_slots, int **allocations, int **slots)</div><div class='del'>-{</div><div class='del'>-	struct layout_info li;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (num_slots != NULL);</div><div class='del'>-	g_return_if_fail (allocations != NULL);</div><div class='del'>-	g_return_if_fail (slots != NULL);</div><div class='del'>-</div><div class='del'>-	if (!events) {</div><div class='del'>-		*num_slots = 0;</div><div class='del'>-		*allocations = NULL;</div><div class='del'>-		*slots = NULL;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	li.events = events;</div><div class='del'>-	li.num_events = g_list_length (events);</div><div class='del'>-	li.func = func;</div><div class='del'>-</div><div class='del'>-	/* Build the partition of the time range, and then build the array of slots */</div><div class='del'>-</div><div class='del'>-	build_partition (&amp;li);</div><div class='del'>-</div><div class='del'>-	li.array = g_new (int, li.num_rows * MAX_EVENTS_PER_ROW);</div><div class='del'>-	for (i = 0; i &lt; (li.num_rows * MAX_EVENTS_PER_ROW); i++)</div><div class='del'>-		li.array[i] = -1; /* This is our 'empty' value */</div><div class='del'>-</div><div class='del'>-	/* Build the arrays for allocations and columns used */</div><div class='del'>-</div><div class='del'>-	li.allocations = g_new (int, li.num_events);</div><div class='del'>-	li.slots = g_new (int, li.num_events);</div><div class='del'>-</div><div class='del'>-	/* Perform initial allocation and then expand the events to as many</div><div class='del'>-         * slots as they can occupy.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	initial_allocate (&amp;li);</div><div class='del'>-	expand_events (&amp;li);</div><div class='del'>-</div><div class='del'>-	/* Clean up and return values */</div><div class='del'>-</div><div class='del'>-	g_free (li.partition);</div><div class='del'>-	g_free (li.array);</div><div class='del'>-</div><div class='del'>-	*num_slots = li.num_slots;</div><div class='del'>-	*allocations = li.allocations;</div><div class='del'>-	*slots = li.slots;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/layout.h b/calendar/gui/layout.h<br/>deleted file mode 100644<br/>index ed40e40a29..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/layout.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/layout.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* Evolution calendar - Event layout engine</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#ifndef LAYOUT_H</div><div class='del'>-#define LAYOUT_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'>-</div><div class='del'>-</div><div class='del'>-/* Functions of this type must translate the list item into two time_t values</div><div class='del'>- * for the start and end of an event.</div><div class='del'>- */</div><div class='del'>-typedef void (* LayoutQueryTimeFunc) (GList *event, time_t *start, time_t *end);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is the main layout function for overlapping events.  You pass in a list</div><div class='del'>- * of (presumably) events and a function that should take a list element and</div><div class='del'>- * return the start and end times for the event corresponding to that list</div><div class='del'>- * element.</div><div class='del'>- *</div><div class='del'>- * It returns the number of slots ("columns") that you need to take into account</div><div class='del'>- * when actually painting the events, the array of the first slot index that</div><div class='del'>- * each event occupies, and the array of number of slots that each event</div><div class='del'>- * occupies.  You have to free both arrays.</div><div class='del'>- *</div><div class='del'>- * You will get somewhat better-looking results if the list of events is sorted</div><div class='del'>- * by using the start time as the primary sort key and the end time as the</div><div class='del'>- * secondary sort key -- so that "longer" events go first in the list.</div><div class='del'>- */</div><div class='del'>-void layout_events (GList *events, LayoutQueryTimeFunc func,</div><div class='del'>-		    int *num_slots, int **allocations, int **slots);</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/main.c b/calendar/gui/main.c<br/>deleted file mode 100644<br/>index 486372463d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/main.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +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  Helix Code, 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 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: 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;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef USING_OAF</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;libgnorba/gnorba.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 &lt;gui/alarm.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'>-#include "component-factory.h"</div><div class='del'>-#include "control-factory.h"</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'>-#ifdef USING_OAF</div><div class='del'>-	/* FIXME: VERSION instead of "0.0".  */</div><div class='del'>-	gnome_init_with_popt_table ("evolution-calendar", "0.0",</div><div class='del'>-				    *argc, argv, oaf_popt_options,</div><div class='del'>-				    0, NULL);</div><div class='del'>-	oaf_init (*argc, argv);</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_CORBA_init_with_popt_table (</div><div class='del'>-		"evolution-calendar", "0.0",</div><div class='del'>-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-#endif</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'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	init_bonobo (&amp;argc, argv);</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-	alarm_init ();</div><div class='del'>-</div><div class='del'>-	init_calendar ();</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'>-	control_factory_init ();</div><div class='del'>-	component_factory_init ();</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/calendar/gui/mark.c b/calendar/gui/mark.c<br/>deleted file mode 100644<br/>index ea83845b2a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/mark.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/mark.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,289 +0,0 @@</div><div class='del'>-/* Evolution calendar - Functions to mark calendars</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat Software, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "mark.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Frees the specified data when an object is destroyed */</div><div class='del'>-static void</div><div class='del'>-free_data (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* If the array of "marked" attributes for the days in a a month item has not been created yet, this</div><div class='del'>- * function creates the array and clears it.  Otherwise, it just returns the existing array.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-get_attributes (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	char *attrs;</div><div class='del'>-</div><div class='del'>-	attrs = gtk_object_get_data (GTK_OBJECT (mitem), "day_mark_attributes");</div><div class='del'>-</div><div class='del'>-	if (!attrs) {</div><div class='del'>-		attrs = g_new0 (char, 42);</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (mitem), "day_mark_attributes", attrs);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (mitem), "destroy",</div><div class='del'>-				    (GtkSignalFunc) free_data,</div><div class='del'>-				    attrs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return attrs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-colorify_month_item (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (mitem != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-</div><div class='del'>-	unmark_month_item (mitem);</div><div class='del'>-</div><div class='del'>-	/* We have to do this in several calls to gnome_canvas_item_set(), as color_spec_from_prop()</div><div class='del'>-	 * returns a pointer to a static string -- and we need several values.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),</div><div class='del'>-			       "heading_color", (* func) (COLOR_PROP_HEADING_COLOR, func_data),</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),</div><div class='del'>-			       "outline_color", (* func) (COLOR_PROP_OUTLINE_COLOR, func_data),</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),</div><div class='del'>-			       "day_box_color", (* func) (COLOR_PROP_EMPTY_DAY_BG, func_data),</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),</div><div class='del'>-			       "day_color", (* func) (COLOR_PROP_DAY_FG, func_data),</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* In the month item, marks all the days that are touched by the specified time span.  Assumes that</div><div class='del'>- * the time span is completely contained within the month.  The array of day attributes is modified</div><div class='del'>- * accordingly.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-mark_event_in_month (GnomeMonthItem *mitem, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-	int day_index;</div><div class='del'>-	</div><div class='del'>-	tm = *localtime (&amp;start);</div><div class='del'>-</div><div class='del'>-	for (; start &lt;= end; start += 60 * 60 * 24) {</div><div class='del'>-		mktime (&amp;tm); /* normalize the time */</div><div class='del'>-</div><div class='del'>-		/* Figure out the day index that corresponds to this time */</div><div class='del'>-</div><div class='del'>-		day_index = gnome_month_item_day2index (mitem, tm.tm_mday);</div><div class='del'>-		g_assert (day_index &gt;= 0);</div><div class='del'>-</div><div class='del'>-		/* Mark the day box */</div><div class='del'>-</div><div class='del'>-		mark_month_item_index (mitem, day_index, default_color_func, NULL);</div><div class='del'>-</div><div class='del'>-		/* Next day */</div><div class='del'>-</div><div class='del'>-		tm.tm_mday++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	time_t month_begin, month_end;</div><div class='del'>-	GList *events;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (mitem != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));</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'>-	month_begin = time_month_begin (time_from_day (mitem-&gt;year, mitem-&gt;month, 1));</div><div class='del'>-	month_end = time_month_end (month_begin);</div><div class='del'>-</div><div class='del'>-	events = cal_client_get_events_in_range (gcal-&gt;client, month_begin, month_end);</div><div class='del'>-</div><div class='del'>-	for (l = events; l; l = l-&gt;next) {</div><div class='del'>-		CalObjInstance *coi;</div><div class='del'>-</div><div class='del'>-		coi = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* We clip the event's start and end times to the month's limits */</div><div class='del'>-</div><div class='del'>-		mark_event_in_month (mitem,</div><div class='del'>-				     MAX (coi-&gt;start, month_begin),</div><div class='del'>-				     MIN (coi-&gt;end, month_end));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_instance_list_free (events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data)</div><div class='del'>-{</div><div class='del'>-	char *attrs;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (mitem != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));</div><div class='del'>-	g_return_if_fail ((index &gt;= 0) &amp;&amp; (index &lt; 42));</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-</div><div class='del'>-	attrs = get_attributes (mitem);</div><div class='del'>-</div><div class='del'>-	attrs[index] = TRUE;</div><div class='del'>-</div><div class='del'>-	item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + index);</div><div class='del'>-	gnome_canvas_item_set (item,</div><div class='del'>-			       "fill_color", (* func) (COLOR_PROP_MARK_DAY_BG, func_data),</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-unmark_month_item (GnomeMonthItem *mitem)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *attrs;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (mitem != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));</div><div class='del'>-</div><div class='del'>-	attrs = get_attributes (mitem);</div><div class='del'>-</div><div class='del'>-	/* Find marked days and unmark them by turning off their marked attribute flag and changing</div><div class='del'>-	 * the color.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++)</div><div class='del'>-		if (attrs[i]) {</div><div class='del'>-			attrs[i] = FALSE;</div><div class='del'>-</div><div class='del'>-			item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + i);</div><div class='del'>-			gnome_canvas_item_set (item,</div><div class='del'>-					       "fill_color", color_spec_from_prop (COLOR_PROP_EMPTY_DAY_BG),</div><div class='del'>-					       NULL);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handles EnterNotify and LeaveNotify events from the month item's day groups, and performs</div><div class='del'>- * appropriate prelighting.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-day_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeMonthItem *mitem;</div><div class='del'>-	GnomeCanvasItem *box;</div><div class='del'>-	int child_num, day;</div><div class='del'>-	GetColorFunc func;</div><div class='del'>-	gpointer func_data;</div><div class='del'>-	char *color;</div><div class='del'>-	char *attrs;</div><div class='del'>-</div><div class='del'>-	/* We only accept enters and leaves */</div><div class='del'>-</div><div class='del'>-	if (!((event-&gt;type == GDK_ENTER_NOTIFY) || (event-&gt;type == GDK_LEAVE_NOTIFY)))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get index information */</div><div class='del'>-</div><div class='del'>-	mitem = GNOME_MONTH_ITEM (data);</div><div class='del'>-	child_num = gnome_month_item_child2num (mitem, item);</div><div class='del'>-	day = gnome_month_item_num2day (mitem, child_num);</div><div class='del'>-</div><div class='del'>-	if (day == 0)</div><div class='del'>-		return FALSE; /* it was a day outside the month's range */</div><div class='del'>-</div><div class='del'>-	child_num -= GNOME_MONTH_ITEM_DAY_GROUP;</div><div class='del'>-	box = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + child_num);</div><div class='del'>-</div><div class='del'>-	/* Get colors */</div><div class='del'>-</div><div class='del'>-	func = gtk_object_get_data (GTK_OBJECT (mitem), "prelight_color_func");</div><div class='del'>-	func_data = gtk_object_get_data (GTK_OBJECT (mitem), "prelight_color_data");</div><div class='del'>-</div><div class='del'>-	/* Now actually set the proper color in the item */</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_ENTER_NOTIFY:</div><div class='del'>-		color = (* func) (COLOR_PROP_PRELIGHT_DAY_BG, func_data);</div><div class='del'>-		gnome_canvas_item_set (box,</div><div class='del'>-				       "fill_color", color,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_LEAVE_NOTIFY:</div><div class='del'>-		attrs = get_attributes (mitem);</div><div class='del'>-		color = (* func) (attrs[child_num] ? COLOR_PROP_MARK_DAY_BG : COLOR_PROP_EMPTY_DAY_BG,</div><div class='del'>-				  func_data);</div><div class='del'>-		gnome_canvas_item_set (box,</div><div class='del'>-				       "fill_color", color,</div><div class='del'>-				       NULL);</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 TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-month_item_prepare_prelight (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *day_group;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (mitem != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-</div><div class='del'>-	/* Store the function in the object data */</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (mitem), "prelight_color_func", func);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (mitem), "prelight_color_data", func_data);</div><div class='del'>-</div><div class='del'>-	/* Connect the appropriate signals to perform prelighting */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++) {</div><div class='del'>-		day_group = gnome_month_item_num2child (GNOME_MONTH_ITEM (mitem), GNOME_MONTH_ITEM_DAY_GROUP + i);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (day_group), "event",</div><div class='del'>-				    (GtkSignalFunc) day_event,</div><div class='del'>-				    mitem);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-default_color_func (ColorProp propnum, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return color_spec_from_prop (propnum);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/mark.h b/calendar/gui/mark.h<br/>deleted file mode 100644<br/>index 76c82c580d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/mark.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/mark.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/* Evolution calendar - Functions to mark calendars</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat Software, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#ifndef MARK_H</div><div class='del'>-#define MARK_H</div><div class='del'>-</div><div class='del'>-/*#include "calendar.h"*/</div><div class='del'>-#include "gnome-month-item.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are the fonts used for the montly calendars */</div><div class='del'>-</div><div class='del'>-#define HEADING_FONTSET         "-adobe-helvetica-medium-r-*-*-14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-medium-r-*-*-14-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define TITLE_FONTSET           "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--12-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define DAY_HEADING_FONTSET     "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--10-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define NORMAL_DAY_FONTSET      "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--10-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define CURRENT_DAY_FONTSET     "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--12-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define BIG_DAY_HEADING_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--14-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define BIG_NORMAL_DAY_FONTSET  "-adobe-helvetica-medium-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--14-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define BIG_CURRENT_DAY_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--14-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-#define EVENT_FONTSET           "-adobe-helvetica-medium-r-*-*-10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--10-*-*-*-*-*-ksc5601.1987-0,*"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Functions of this type are used by the marking functions to fetch color specifications.  Such</div><div class='del'>- * a function must return a color spec based on the property passed to it.</div><div class='del'>- */</div><div class='del'>-typedef char * (* GetColorFunc) (ColorProp propnum, gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Sets the user-configured colors and font for a month item.  It also tags the days as unmarked. */</div><div class='del'>-void colorify_month_item (GnomeMonthItem *month, GetColorFunc func, gpointer func_data);</div><div class='del'>-</div><div class='del'>-/* Takes a monthly calendar item and marks the days that have events</div><div class='del'>- * scheduled for them in the specified calendar.  It also highlights</div><div class='del'>- * the current day.</div><div class='del'>- */</div><div class='del'>-void mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *cal);</div><div class='del'>-</div><div class='del'>-/* Marks a day specified by index, not by day number */</div><div class='del'>-void mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data);</div><div class='del'>-</div><div class='del'>-/* Unmarks all the days in the specified month item */</div><div class='del'>-void unmark_month_item (GnomeMonthItem *mitem);</div><div class='del'>-</div><div class='del'>-/* Prepares a monthly calendar item to prelight when the mouse goes over the days. */</div><div class='del'>-</div><div class='del'>-void month_item_prepare_prelight (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data);</div><div class='del'>-</div><div class='del'>-/* This is the default prelight function you can use for most puposes.  You can use NULL as the</div><div class='del'>- * func_data.</div><div class='del'>- */</div><div class='del'>-char *default_color_func (ColorProp prop_num, 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/gui/monthview.xpm b/calendar/gui/monthview.xpm<br/>deleted file mode 100644<br/>index 1a1b1d936a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/monthview.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/monthview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * monthview_xpm[] = {</div><div class='del'>-"24 24 19 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D1D1D1",</div><div class='del'>-"#	c #BABBCC",</div><div class='del'>-"$	c #AAAFE2",</div><div class='del'>-"%	c #8B90C3",</div><div class='del'>-"&amp;	c #E3E4F5",</div><div class='del'>-"*	c #A3A6C7",</div><div class='del'>-"=	c #5D66BA",</div><div class='del'>-"-	c #3945BB",</div><div class='del'>-";	c #555FC5",</div><div class='del'>-"&gt;	c #2E3BB1",</div><div class='del'>-",	c #727ACE",</div><div class='del'>-"'	c #C7CAEB",</div><div class='del'>-")	c #0010A8",</div><div class='del'>-"!	c #4550B5",</div><div class='del'>-"~	c #1725AC",</div><div class='del'>-"{	c #8E95D8",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</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;=-;&gt;,+@')!++@++. ",</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'>-" .++@+'&gt;,$=-+#$)&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='head'>diff --git a/calendar/gui/popup-menu.c b/calendar/gui/popup-menu.c<br/>deleted file mode 100644<br/>index a90c38d490..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/popup-menu.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/popup-menu.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* Popup menu utilities for gncal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;quartic@gimp.org&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 "popup-menu.h"</div><div class='del'>-#include "../../e-util/e-gui-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-popup_menu (struct menu_item *items, int nitems, GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *item;</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'>-	/* 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; nitems; i++) {</div><div class='del'>-		if (items[i].text) {</div><div class='del'>-			item = gtk_menu_item_new_with_label (_(items[i].text));</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-					    items[i].callback,</div><div class='del'>-					    items[i].data);</div><div class='del'>-			gtk_widget_set_sensitive (item, items[i].sensitive);</div><div class='del'>-		} else</div><div class='del'>-			item = gtk_menu_item_new ();</div><div class='del'>-</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'>-</div><div class='del'>-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event-&gt;button, event-&gt;time);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/popup-menu.h b/calendar/gui/popup-menu.h<br/>deleted file mode 100644<br/>index a4590dbb98..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/popup-menu.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/popup-menu.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/* Popup menu utilities for gncal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;quartic@gimp.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef POPUP_MENU_H</div><div class='del'>-#define POPUP_MENU_H</div><div class='del'>-</div><div class='del'>-#include &lt;gdk/gdktypes.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct menu_item {</div><div class='del'>-	char *text;</div><div class='del'>-	GtkSignalFunc callback;</div><div class='del'>-	gpointer data;</div><div class='del'>-	int sensitive;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void popup_menu (struct menu_item *items, int nitems, GdkEventButton *event);</div><div class='del'>-</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 3b4f2c4a18..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/print.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1255 +0,0 @@</div><div class='del'>-/* Evolution calendar - Print support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;gnome.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-profile.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;cal-util/timeutil.h&gt;</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "layout.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* copied from gnome-month-item.c  this should be shared?? */</div><div class='del'>-</div><div class='del'>-/* Number of days in a month, for normal and leap years */</div><div class='del'>-static const int days_in_month[2][12] = {</div><div class='del'>-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },</div><div class='del'>-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the</div><div class='del'>- * Gregorian reformation.</div><div class='del'>- */</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'>-</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'>-#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'>-/* Returns the number of leap years since year 1 up to (but not including) the specified year */</div><div class='del'>-static int</div><div class='del'>-leap_years_up_to (int year)</div><div class='del'>-{</div><div class='del'>-	return (year / 4					/* trivial leapness */</div><div class='del'>-		- ((year &gt; 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */</div><div class='del'>-		+ ((year &gt; 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified year is a leap year */</div><div class='del'>-static int</div><div class='del'>-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'>-/* Returns the 1-based day number within the year of the specified date */</div><div class='del'>-static int</div><div class='del'>-day_in_year (int day, int month, int year)</div><div class='del'>-{</div><div class='del'>-	int is_leap, i;</div><div class='del'>-</div><div class='del'>-	is_leap = is_leap_year (year);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; month; i++)</div><div class='del'>-		day += days_in_month [is_leap][i];</div><div class='del'>-</div><div class='del'>-	return day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days</div><div class='del'>- * that were removed on the Gregorian reformation, it returns Thursday.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-day_in_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 + leap_years_up_to (year - 1) + day_in_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'>-/* 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 start_on_monday, 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;</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 = days_in_month[is_leap_year (year)][month];</div><div class='del'>-	d_week = day_in_week (1, month, year);</div><div class='del'>-</div><div class='del'>-	if (start_on_monday)</div><div class='del'>-		d_week = (d_week + 6) % 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'>-</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_CENTRE,</div><div class='del'>-	ALIGN_BORDER= 1&lt;&lt;8</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* width = width of border, -'ve is no border</div><div class='del'>-   fillcolour = shade of fill, -'ve is no fill */</div><div class='del'>-static void</div><div class='del'>-print_border(GnomePrintContext *pc, double l, double r, double t, double b, double width, double fillcolour)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	gnome_print_gsave (pc);</div><div class='del'>-	if (fillcolour&lt;0.0)</div><div class='del'>-		i=1;</div><div class='del'>-	else</div><div class='del'>-		i=0;</div><div class='del'>-	for (;i&lt;2;i++) {</div><div class='del'>-		gnome_print_moveto(pc, l, t);</div><div class='del'>-		gnome_print_lineto(pc, l, b);</div><div class='del'>-		gnome_print_lineto(pc, r, b);</div><div class='del'>-		gnome_print_lineto(pc, r, t);</div><div class='del'>-		gnome_print_lineto(pc, l, t);</div><div class='del'>-		if (i==0) {</div><div class='del'>-			gnome_print_setrgbcolor(pc, fillcolour, fillcolour, fillcolour);</div><div class='del'>-			gnome_print_fill(pc);</div><div class='del'>-			if (width&lt;0.0)</div><div class='del'>-				i=2;</div><div class='del'>-		} else {</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'>-/* outputs 1 line of aligned text in a box */</div><div class='del'>-static void</div><div class='del'>-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text, enum align_box align, double l, double r, double t, double b)</div><div class='del'>-{</div><div class='del'>-	double w, x;</div><div class='del'>-	gnome_print_gsave (pc);</div><div class='del'>-	w = gnome_font_get_width_string(font, text);</div><div class='del'>-	switch (align&amp;3) {</div><div class='del'>-	default:</div><div class='del'>-	case ALIGN_LEFT:</div><div class='del'>-		x = l;</div><div class='del'>-		break;</div><div class='del'>-	case ALIGN_RIGHT:</div><div class='del'>-		x = l+(r-l)-w-2;</div><div class='del'>-		break;</div><div class='del'>-	case ALIGN_CENTRE:</div><div class='del'>-		x = l+((r-l)-w)/2;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gnome_print_moveto(pc, x, t-font-&gt;size);</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'>-	gnome_print_grestore (pc);</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(GnomePrintContext *pc, double size, const char *text, 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 = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);</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, enum align_box align, double *l, double *r, double *t, double *b, double linewidth)</div><div class='del'>-{</div><div class='del'>-	if (align&amp;ALIGN_BORDER) {</div><div class='del'>-		gnome_print_gsave(pc);</div><div class='del'>-		print_border(pc, *l, *r, *t, *t-font-&gt;size-font-&gt;size*0.4, linewidth, 0.9);</div><div class='del'>-		print_border(pc, *l, *r, *t-font-&gt;size-font-&gt;size*0.4, *b, linewidth, -1.0);</div><div class='del'>-		gnome_print_grestore(pc);</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'>-	print_text(pc, font, text, align, *l, *r, *t, *b);</div><div class='del'>-	*t-=font-&gt;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'>-	char fmt[64];</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tm = *localtime(&amp;time);</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'>-	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,</div><div class='del'>-		   time_t month, double left, double right, double top, double bottom,</div><div class='del'>-		   int titleflags, time_t greystart, time_t greyend, int bordertitle)</div><div class='del'>-{</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;</div><div class='del'>-	char buf[100];</div><div class='del'>-	struct tm tm;</div><div class='del'>-	double xpad, ypad, size;</div><div class='del'>-	char *daynames[] = { _("Su"), _("Mo"), _("Tu"), _("We"), _("Th"), _("Fr"), _("Sa") };</div><div class='del'>-</div><div class='del'>-	xpad = (right-left)/7;</div><div class='del'>-	ypad = (top-bottom)/8.3;</div><div class='del'>-	if (xpad&gt;ypad)</div><div class='del'>-		size=ypad;</div><div class='del'>-	else</div><div class='del'>-		size=xpad;</div><div class='del'>-</div><div class='del'>-	size = (xpad+ypad)/3.0;</div><div class='del'>-</div><div class='del'>-        tm = *localtime (&amp;month);</div><div class='del'>-</div><div class='del'>-	/* get month days */</div><div class='del'>-	build_month(tm.tm_mon, tm.tm_year+1900, week_starts_on_monday, days, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* build day-busy bits */</div><div class='del'>-	now = time_month_begin(month);</div><div class='del'>-</div><div class='del'>-	/* get title */</div><div class='del'>-	format_date(month, titleflags, buf, 100);</div><div class='del'>-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 1, size*1.2); /* title font */</div><div class='del'>-	if (bordertitle)</div><div class='del'>-		print_border(pc,</div><div class='del'>-			     left, left+7*xpad, top, top-font-&gt;size*1.3,</div><div class='del'>-			     1.0, 0.9);</div><div class='del'>-	print_text(pc, font, buf, ALIGN_CENTRE,</div><div class='del'>-		   left, left+7*xpad, top, top - font-&gt;size);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	font_normal = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);</div><div class='del'>-	font_bold = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);</div><div class='del'>-</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0,0,0);</div><div class='del'>-	for (x=0;x&lt;7;x++) {</div><div class='del'>-		print_text(pc, font_bold, daynames[(week_starts_on_monday?x+1:x)%7], ALIGN_CENTRE,</div><div class='del'>-			   left+x*xpad, left+(x+1)*xpad, bottom+7*ypad, bottom+7*ypad-font_bold-&gt;size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (y=0;y&lt;6;y++) {</div><div class='del'>-		for (x=0;x&lt;7;x++) {</div><div class='del'>-			day = days[y*7+x];</div><div class='del'>-			if (day!=0) {</div><div class='del'>-				GList *events;</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'>-				events = cal_client_get_events_in_range (gcal-&gt;client,</div><div class='del'>-									 now,</div><div class='del'>-									 time_day_end (now));</div><div class='del'>-				font = events ? font_bold : font_normal;</div><div class='del'>-				cal_obj_instance_list_free (events);</div><div class='del'>-</div><div class='del'>-				next = time_add_day(now, 1);</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'>-						     left+x*xpad+xpad*0.1,</div><div class='del'>-						     left+(x+1)*xpad+xpad*0.1,</div><div class='del'>-						     bottom+(5-y)*ypad+font-&gt;size-ypad*0.15,</div><div class='del'>-						     bottom+(5-y)*ypad-ypad*0.15,</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'>-					   left+x*xpad, left+(x+1)*xpad, bottom+(5-y)*ypad+font-&gt;size, bottom+(5-y)*ypad);</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, char *text, 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'>-	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 -= font-&gt;size;</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_width(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_string_n(font, outbuffer, o-wordstart);</div><div class='del'>-			o=outbuffer+(o-wordstart);</div><div class='del'>-			wordstart = outbuffer;</div><div class='del'>-			top -= font-&gt;size;</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 -= font-&gt;size;</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'>-/* Used with layout_events(), takes in a list element and returns the start and</div><div class='del'>- * end times for the event corresponding to that element.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-event_layout_query_func (GList *instance, time_t *start, time_t *end)</div><div class='del'>-{</div><div class='del'>-	CalObjInstance *coi = instance-&gt;data;</div><div class='del'>-</div><div class='del'>-	*start = coi-&gt;start;</div><div class='del'>-	*end = coi-&gt;end;</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'>-	time_t start, end;</div><div class='del'>-	GList *l, *events;</div><div class='del'>-	int num_slots, *allocations, *slots;</div><div class='del'>-	int i;</div><div class='del'>-	GnomeFont *font_hour, *font_minute, *font_summary;</div><div class='del'>-	double yinc, y, yend, x, xend;</div><div class='del'>-	double width=40, slot_width;</div><div class='del'>-	char buf[20];</div><div class='del'>-</div><div class='del'>-	yinc = (top-bottom)/24;</div><div class='del'>-</div><div class='del'>-	/* fill static detail */</div><div class='del'>-	font_hour = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/2);</div><div class='del'>-	font_minute = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/3);</div><div class='del'>-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, yinc/3);</div><div class='del'>-</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* internal lines */</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'>-	for (i=0;i&lt;24;i++) {</div><div class='del'>-		y = top - yinc*(i+1);</div><div class='del'>-		print_border(pc, left+1, left+width-1, y, y+yinc-1, -1.0, 0.9);</div><div class='del'>-		gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		/* the hour label/minute */</div><div class='del'>-		sprintf(buf, "%d", i);</div><div class='del'>-		print_text(pc, font_hour, buf, ALIGN_RIGHT, left, left+width/2, y+yinc, y);</div><div class='del'>-		switch(i) {</div><div class='del'>-		case 12: sprintf(buf, _("pm")); break;</div><div class='del'>-		case 0: sprintf(buf, _("am")); break;</div><div class='del'>-		default: sprintf(buf, "00"); break;</div><div class='del'>-		}</div><div class='del'>-		print_text(pc, font_minute, buf, ALIGN_LEFT, left+width/2, left+width/2, y+yinc, y);</div><div class='del'>-</div><div class='del'>-		/* internal lines */</div><div class='del'>-		gnome_print_moveto(pc, left+width, y);</div><div class='del'>-		gnome_print_lineto(pc, right, y);</div><div class='del'>-		gnome_print_stroke (pc);</div><div class='del'>-		gnome_print_moveto(pc, left+width/2, 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'>-	}</div><div class='del'>-</div><div class='del'>-	start = time_day_begin(whence);</div><div class='del'>-	end = time_day_end(start);</div><div class='del'>-</div><div class='del'>-	events = cal_client_get_events_in_range (gcal-&gt;client, start, end);</div><div class='del'>-</div><div class='del'>-	layout_events (events, event_layout_query_func, &amp;num_slots, &amp;allocations, &amp;slots);</div><div class='del'>-</div><div class='del'>-	slot_width = (right-left-width)/num_slots;</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = events; l != NULL; l = l-&gt;next, i++) {</div><div class='del'>-		CalObjInstance *coi;</div><div class='del'>-		iCalObject *ico;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-		coi = l-&gt;data;</div><div class='del'>-		status = cal_client_get_object (gcal-&gt;client, coi-&gt;uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			/* Go on */</div><div class='del'>-			break;</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-			g_message ("print_day_details(): syntax error in fetched object");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		y = top - (top - bottom) * (coi-&gt;start - start) / (end - start) - 1;</div><div class='del'>-		yend = top - (top - bottom) * (coi-&gt;end - start) / (end - start) + 1;</div><div class='del'>-		x = left + width + slot_width * allocations[i];</div><div class='del'>-</div><div class='del'>-		if (num_slots &gt; 0)</div><div class='del'>-			x++;</div><div class='del'>-</div><div class='del'>-		xend = x + slots[i] * slot_width - 2;</div><div class='del'>-</div><div class='del'>-		print_border (pc, x, xend, y, yend, 0.0, 0.9);</div><div class='del'>-</div><div class='del'>-		bound_text (pc, font_summary, ico-&gt;summary, x, xend, y, yend, 0);</div><div class='del'>-		ical_object_unref (ico);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_instance_list_free (events);</div><div class='del'>-	g_free (allocations);</div><div class='del'>-	g_free (slots);</div><div class='del'>-</div><div class='del'>-	print_border (pc, left, right, top, bottom, 1.0, -1.0);</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'>-	gtk_object_unref (GTK_OBJECT (font_summary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#define TIME_FMT "%X"</div><div class='del'>-#else</div><div class='del'>-#define TIME_FMT "%l:%M%p"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_day_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,</div><div class='del'>-		   double left, double right, double top, double bottom,</div><div class='del'>-		   double size, int totime, int titleformat)</div><div class='del'>-{</div><div class='del'>-	time_t start, end;</div><div class='del'>-	GList *l, *events;</div><div class='del'>-	int i;</div><div class='del'>-	GnomeFont *font_summary;</div><div class='del'>-	double y, yend, x, xend, inc, incsmall;</div><div class='del'>-	char buf[100];</div><div class='del'>-	double margin;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	/* fill static detail */</div><div class='del'>-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);</div><div class='del'>-</div><div class='del'>-	gnome_print_setfont (pc, font_summary);</div><div class='del'>-</div><div class='del'>-	start = time_day_begin(whence);</div><div class='del'>-	end = time_day_end(start);</div><div class='del'>-</div><div class='del'>-	tm = *localtime(&amp;start);</div><div class='del'>-</div><div class='del'>-	format_date(start, titleformat, buf, 100);</div><div class='del'>-	titled_box (pc, buf, font_summary, ALIGN_RIGHT | ALIGN_BORDER,</div><div class='del'>-		    &amp;left, &amp;right, &amp;top, &amp;bottom, 0.0);</div><div class='del'>-</div><div class='del'>-	events = cal_client_get_events_in_range (gcal-&gt;client, start, end);</div><div class='del'>-</div><div class='del'>-	inc = size*0.3;</div><div class='del'>-	incsmall = size*0.2;</div><div class='del'>-</div><div class='del'>-	y = top-inc;</div><div class='del'>-	yend = bottom-incsmall;</div><div class='del'>-</div><div class='del'>-	/* do a good rough approximation of the 'widest' time */</div><div class='del'>-	tm.tm_year = 2000;</div><div class='del'>-	tm.tm_mon = 12;</div><div class='del'>-	tm.tm_mday = 22;</div><div class='del'>-	tm.tm_sec = 22;</div><div class='del'>-	tm.tm_min = 22;</div><div class='del'>-	tm.tm_hour = 23;</div><div class='del'>-	strftime(buf, 100, TIME_FMT, &amp;tm);</div><div class='del'>-	margin = gnome_font_get_width_string(font_summary, buf);</div><div class='del'>-</div><div class='del'>-	for (i=0, l = events; l != NULL; l = l-&gt;next, i++) {</div><div class='del'>-		CalObjInstance *coi;</div><div class='del'>-		iCalObject *ico;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-		coi = l-&gt;data;</div><div class='del'>-		status = cal_client_get_object (gcal-&gt;client, coi-&gt;uid, &amp;ico);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			/* Go on */</div><div class='del'>-			break;</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-			g_message ("print_day_summary(): syntax error in fetched object");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		x = left + incsmall;</div><div class='del'>-		xend = right - inc;</div><div class='del'>-</div><div class='del'>-		if (y - font_summary-&gt;size &lt; bottom)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		tm = *localtime (&amp;coi-&gt;start);</div><div class='del'>-		strftime (buf, 100, TIME_FMT, &amp;tm);</div><div class='del'>-		gnome_print_moveto (pc, x + (margin</div><div class='del'>-					     - gnome_font_get_width_string (font_summary, buf)),</div><div class='del'>-				    y - font_summary-&gt;size);</div><div class='del'>-		gnome_print_show (pc, buf);</div><div class='del'>-</div><div class='del'>-		if (totime) {</div><div class='del'>-			tm = *localtime (&amp;coi-&gt;end);</div><div class='del'>-			strftime (buf, 100, TIME_FMT, &amp;tm);</div><div class='del'>-			gnome_print_moveto (pc,</div><div class='del'>-					    (x + margin + inc</div><div class='del'>-					     + (margin</div><div class='del'>-						- gnome_font_get_width_string (font_summary, buf))),</div><div class='del'>-					    y - font_summary-&gt;size);</div><div class='del'>-			gnome_print_show (pc, buf);</div><div class='del'>-</div><div class='del'>-			y = bound_text (pc, font_summary, ico-&gt;summary,</div><div class='del'>-					x + margin * 2 + inc * 2, xend,</div><div class='del'>-					y, yend, 0);</div><div class='del'>-		} else {</div><div class='del'>-			/* we also indent back after each time is printed */</div><div class='del'>-			y = bound_text (pc, font_summary, ico-&gt;summary,</div><div class='del'>-					x + margin + inc, xend,</div><div class='del'>-					y, yend, -margin + inc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		y += font_summary-&gt;size - inc;</div><div class='del'>-</div><div class='del'>-		ical_object_unref (ico);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_instance_list_free (events);</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'>-static void</div><div class='del'>-print_week_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'>-	double y, l, r, t, b;</div><div class='del'>-	time_t now;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	l = left;</div><div class='del'>-	r = (right-left)/2+left;</div><div class='del'>-	t = top;</div><div class='del'>-	y = (top-bottom)/3;</div><div class='del'>-	b = top-y;</div><div class='del'>-	now = time_week_begin(whence); /* returns sunday, we need monday */</div><div class='del'>-	now = time_add_day(now, 1);</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		print_day_summary (pc, gcal, now, l, r, t, b,</div><div class='del'>-				   10, TRUE, DATE_DAY | DATE_DAYNAME | DATE_MONTH);</div><div class='del'>-		now = time_add_day (now, 1);</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 5:</div><div class='del'>-			y /= 2.0;</div><div class='del'>-			b += y;</div><div class='del'>-		case 0:</div><div class='del'>-		case 1:</div><div class='del'>-		case 3:</div><div class='del'>-		case 4:</div><div class='del'>-			t -= y;</div><div class='del'>-			b -= y;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			l = r;</div><div class='del'>-			r = right;</div><div class='del'>-			t = top;</div><div class='del'>-			b = t-y;</div><div class='del'>-			break;</div><div class='del'>-		case 6:</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'>-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,</div><div class='del'>-		    double left, double right, double top, double bottom, int morerows)</div><div class='del'>-{</div><div class='del'>-	double y, x, l, r, t, b;</div><div class='del'>-	time_t now;</div><div class='del'>-	int xx, yy, rows, cols;</div><div class='del'>-</div><div class='del'>-	l = left;</div><div class='del'>-	t = top;</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'>-	y = (top-bottom)/rows;</div><div class='del'>-	x = (right-left)/cols;</div><div class='del'>-	r = l+x;</div><div class='del'>-	b = top-y;</div><div class='del'>-	now = time_year_begin(whence);</div><div class='del'>-	for (yy = 0; yy &lt; rows; yy++) {</div><div class='del'>-		t = top - y * yy;</div><div class='del'>-		b = t - y;</div><div class='del'>-		for (xx = 0; xx &lt; cols; xx++) {</div><div class='del'>-			l = left + x * xx;</div><div class='del'>-			r = l + x;</div><div class='del'>-			print_month_small (pc, gcal, now,</div><div class='del'>-					   l + 8, r - 8, t - 8, b + 8, DATE_MONTH, 0, 0, TRUE);</div><div class='del'>-			now = time_add_month (now, 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'>-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'>-	time_t now, today;</div><div class='del'>-	int days[42];</div><div class='del'>-	int day;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	int x, y;</div><div class='del'>-	char buf[100];</div><div class='del'>-	GnomeFont *font_days;</div><div class='del'>-</div><div class='del'>-	now = time_month_begin(whence);</div><div class='del'>-        tm = *localtime (&amp;now);</div><div class='del'>-</div><div class='del'>-	/* get month days */</div><div class='del'>-	build_month(tm.tm_mon, tm.tm_year+1900, week_starts_on_monday, days, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* a little margin */</div><div class='del'>-	top -= 4;</div><div class='del'>-</div><div class='del'>-	/* do day names ... */</div><div class='del'>-	font_days = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, 10);</div><div class='del'>-	gnome_print_setfont(pc, font_days);</div><div class='del'>-	for (x=0;x&lt;7;x++) {</div><div class='del'>-		today = time_add_day(now, days[6+x]);</div><div class='del'>-		format_date(today, DATE_DAYNAME, buf, 100);</div><div class='del'>-		print_text(pc, font_days, buf, ALIGN_CENTRE,</div><div class='del'>-			   (right-left)*x/7+left, (right-left)*(x+1)/7+left,</div><div class='del'>-			   top, top-font_days-&gt;size);</div><div class='del'>-	}</div><div class='del'>-	top -= font_days-&gt;size*1.5;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font_days));</div><div class='del'>-</div><div class='del'>-	for (y=0;y&lt;6;y++) {</div><div class='del'>-		for (x=0;x&lt;7;x++) {</div><div class='del'>-			day = days[y*7+x];</div><div class='del'>-			if (day!=0) {</div><div class='del'>-				print_day_summary (pc, gcal, now,</div><div class='del'>-						   (right-left)*x/7+left,</div><div class='del'>-						   (right-left)*(x+1)/7+left,</div><div class='del'>-						   top - (top-bottom)*y/6,</div><div class='del'>-						   top - (top-bottom)*(y+1)/6, 6, FALSE,</div><div class='del'>-						   day==1?(DATE_DAY|DATE_MONTH):DATE_DAY);</div><div class='del'>-				now = time_add_day(now, 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 void</div><div class='del'>-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal, 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'>-	GList *l, *todos;</div><div class='del'>-	int i;</div><div class='del'>-	GnomeFont *font_summary;</div><div class='del'>-	double y, yend, x, xend;</div><div class='del'>-</div><div class='del'>-	todos = cal_client_get_uids (gcal-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-</div><div class='del'>-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, 10);</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, _("TODO Items"), font_summary,</div><div class='del'>-		    ALIGN_CENTRE | ALIGN_BORDER, &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'>-	for (i = 0, l = todos; l != NULL; l = l-&gt;next, i++) {</div><div class='del'>-		iCalObject *ico;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_object (gcal-&gt;client, l-&gt;data, &amp;ico);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			/* Go on */</div><div class='del'>-			break;</div><div class='del'>-		case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-			g_message ("print_todo_details(): syntax error in fetched object");</div><div class='del'>-			continue;</div><div class='del'>-		}</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'>-		y = bound_text (pc, font_summary, ico-&gt;summary, x + 2, xend, y, yend, 0);</div><div class='del'>-		y += font_summary-&gt;size;</div><div class='del'>-		gnome_print_moveto (pc, x, y - 3);</div><div class='del'>-		gnome_print_lineto (pc, xend, y - 3);</div><div class='del'>-		gnome_print_stroke (pc);</div><div class='del'>-		y -= 3;</div><div class='del'>-</div><div class='del'>-		ical_object_unref (ico);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (todos);</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'>-#if 0</div><div class='del'>-</div><div class='del'>-static GnomePrintContext *</div><div class='del'>-print_context (int preview, char *paper)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *toplevel, *canvas, *sw;</div><div class='del'>-	GnomePrinter *printer;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-</div><div class='del'>-	if (preview) {</div><div class='del'>-		gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-		gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-</div><div class='del'>-		toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);</div><div class='del'>-		gtk_widget_set_usize (toplevel, 700, 700);</div><div class='del'>-		sw = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-		canvas = gnome_canvas_new_aa ();</div><div class='del'>-		gtk_container_add (GTK_CONTAINER (toplevel), sw);</div><div class='del'>-		gtk_container_add (GTK_CONTAINER (sw), canvas);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_set_pixels_per_unit((GnomeCanvas *)canvas, 1);</div><div class='del'>-</div><div class='del'>-		pc = gnome_print_preview_new ((GnomeCanvas *)canvas, paper);</div><div class='del'>-</div><div class='del'>-		gtk_widget_show_all (toplevel);</div><div class='del'>-</div><div class='del'>-		gtk_widget_pop_visual ();</div><div class='del'>-		gtk_widget_pop_colormap ();</div><div class='del'>-	} else {</div><div class='del'>-		printer = gnome_printer_dialog_new_modal ();</div><div class='del'>-</div><div class='del'>-		if (!printer)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		pc = gnome_print_context_new_with_paper_size (printer, paper);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</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'>-	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'>-	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'>-</div><div class='del'>-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;at);</div><div class='del'>-</div><div class='del'>-	/* Day */</div><div class='del'>-</div><div class='del'>-	strftime (text, sizeof (text), _("Current 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_begin = time_week_begin (at);</div><div class='del'>-	week_end = time_add_day (time_week_end (at), -1);</div><div class='del'>-</div><div class='del'>-	week_begin_tm = *localtime (&amp;week_begin);</div><div class='del'>-	week_end_tm = *localtime (&amp;week_end);</div><div class='del'>-</div><div class='del'>-	/* FIXME: how to make this localization-friendly? */</div><div class='del'>-</div><div class='del'>-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {</div><div class='del'>-		char month[128];</div><div class='del'>-		char day1[128];</div><div class='del'>-		char day2[128];</div><div class='del'>-</div><div class='del'>-		strftime (month, sizeof (month), _("%a"), &amp;week_begin_tm);</div><div class='del'>-		strftime (day1, sizeof (day1), _("%b"), &amp;week_begin_tm);</div><div class='del'>-		strftime (day2, sizeof (day2), _("%b"), &amp;week_end_tm);</div><div class='del'>-</div><div class='del'>-		g_snprintf (text, sizeof (text), _("Current week (%s %s %d - %s %d %d)"),</div><div class='del'>-			    day1, month, week_begin_tm.tm_mday,</div><div class='del'>-			    day2, week_end_tm.tm_mday,</div><div class='del'>-			    week_begin_tm.tm_year + 1900);</div><div class='del'>-	} else {</div><div class='del'>-		char month1[128];</div><div class='del'>-		char month2[128];</div><div class='del'>-		char day1[128];</div><div class='del'>-		char day2[128];</div><div class='del'>-</div><div class='del'>-		strftime (month1, sizeof (month1), _("%a"), &amp;week_begin_tm);</div><div class='del'>-		strftime (month2, sizeof (month2), _("%a"), &amp;week_end_tm);</div><div class='del'>-		strftime (day1, sizeof (day1), _("%b"), &amp;week_begin_tm);</div><div class='del'>-		strftime (day2, sizeof (day2), _("%b"), &amp;week_end_tm);</div><div class='del'>-</div><div class='del'>-		if (week_begin_tm.tm_year == week_end_tm.tm_year)</div><div class='del'>-			g_snprintf (text, sizeof (text),</div><div class='del'>-				    _("Current week (%s %s %d - %s %s %d %d)"),</div><div class='del'>-				    day1, month1, week_begin_tm.tm_mday,</div><div class='del'>-				    day2, month2, week_end_tm.tm_mday,</div><div class='del'>-				    week_begin_tm.tm_year + 1900);</div><div class='del'>-		else</div><div class='del'>-			g_snprintf (text, sizeof (text),</div><div class='del'>-				    _("Current week (%s %s %d %d - %s %s %d %d)"),</div><div class='del'>-				    day1, month1, week_begin_tm.tm_mday,</div><div class='del'>-				    week_begin_tm.tm_year + 1900,</div><div class='del'>-				    day2, month2, week_end_tm.tm_mday,</div><div class='del'>-				    week_end_tm.tm_year + 1900);</div><div class='del'>-	}</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), _("Current month (%a %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), _("Current 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'>-void</div><div class='del'>-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, 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'>-	const GnomePaper *paper_info;</div><div class='del'>-	double l, r, t, b, todo, header;</div><div class='del'>-	char buf[100];</div><div class='del'>-	time_t when;</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 | 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, at, &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), 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), &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'>-	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) - gnome_paper_rmargin (paper_info);</div><div class='del'>-	t = gnome_paper_psheight (paper_info) - 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'>-		int i, days = 1;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; days; i++) {</div><div class='del'>-			todo = ((r - l) / 5) * 4 + l;</div><div class='del'>-			header = t - 70;</div><div class='del'>-			print_todo_details (pc, gcal, 0, INT_MAX, todo, r, header, b);</div><div class='del'>-			print_day_details (pc, gcal, at, l, todo - 2.0, header, b);</div><div class='del'>-</div><div class='del'>-			print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);</div><div class='del'>-</div><div class='del'>-			print_month_small (pc, gcal, at, r - 190, r - 104, t - 4,</div><div class='del'>-					   header + 8, DATE_MONTH | DATE_YEAR, at, at, FALSE);</div><div class='del'>-			print_month_small (pc, gcal, time_add_month (at, 1), r - 90, r - 4, t - 4,</div><div class='del'>-					   header + 8, DATE_MONTH | DATE_YEAR, 0, 0, FALSE);</div><div class='del'>-</div><div class='del'>-			format_date (at, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-			print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, todo, t - 3, header);</div><div class='del'>-</div><div class='del'>-			format_date (at, DATE_DAYNAME, buf, 100);</div><div class='del'>-			print_text_size (pc, 18, buf, ALIGN_LEFT, l + 3, todo, t - 27 - 4, header);</div><div class='del'>-			gnome_print_showpage (pc);</div><div class='del'>-			at = time_add_day (at, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case PRINT_VIEW_WEEK:</div><div class='del'>-		header = t - 70;</div><div class='del'>-		print_week_summary (pc, gcal, at, l, r, header, b);</div><div class='del'>-</div><div class='del'>-		/* more solid total outline */</div><div class='del'>-		print_border (pc, l, r, header, b, 1.0, -1.0);</div><div class='del'>-</div><div class='del'>-		/* header border */</div><div class='del'>-		print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);</div><div class='del'>-</div><div class='del'>-		when = time_week_begin (at);</div><div class='del'>-		when = time_add_day (when, 1);</div><div class='del'>-</div><div class='del'>-		print_month_small (pc, gcal, at, r - 90, r - 4, t - 4,</div><div class='del'>-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),</div><div class='del'>-				   FALSE);</div><div class='del'>-		print_month_small (pc, gcal, time_add_month (at, -1), r - 190, r - 104, t - 4,</div><div class='del'>-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),</div><div class='del'>-				   FALSE);</div><div class='del'>-</div><div class='del'>-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 4, header);</div><div class='del'>-</div><div class='del'>-		when = time_add_day (when, 6);</div><div class='del'>-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 24 - 3, header);</div><div class='del'>-		gnome_print_showpage (pc);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRINT_VIEW_MONTH:</div><div class='del'>-		header = t - 70;</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'>-		/*print_month_summary(pc, cal, at, l, r, header, b);*/</div><div class='del'>-		print_month_summary (pc, gcal, at, b, t, r - 70, l);</div><div class='del'>-</div><div class='del'>-		print_border (pc, b, t, r, r - 72.0, 1.0, 0.9);</div><div class='del'>-</div><div class='del'>-		print_month_small (pc, gcal, time_add_month (at, 1),</div><div class='del'>-				   t - (t - b) / 7 + 2, t - 8, r - 4, r - 68,</div><div class='del'>-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);</div><div class='del'>-		print_month_small (pc, gcal, time_add_month (at, -1),</div><div class='del'>-				   b + 8, b + (t - b) / 7 - 2, r - 4, r - 68,</div><div class='del'>-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);</div><div class='del'>-</div><div class='del'>-		/* centered title */</div><div class='del'>-		format_date (at, DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-		print_text_size (pc, 24, buf, ALIGN_CENTRE, b + 3, t, r - 3, l);</div><div class='del'>-		gnome_print_showpage (pc);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PRINT_VIEW_YEAR:</div><div class='del'>-#if 0</div><div class='del'>-		/* 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'>-		print_year_summary(pc, gcal, at, b, t, r-50, l, FALSE);</div><div class='del'>-</div><div class='del'>-		/* centered title */</div><div class='del'>-		format_date(at, DATE_YEAR, buf, 100);</div><div class='del'>-		print_text_size(pc, 24, buf, ALIGN_CENTRE, b+3, t, r-3, l);</div><div class='del'>-#else</div><div class='del'>-		/* portrait */</div><div class='del'>-		print_year_summary(pc, gcal, at, l, r, t-50, b, TRUE);</div><div class='del'>-</div><div class='del'>-		/* centered title */</div><div class='del'>-		format_date(at, DATE_YEAR, buf, 100);</div><div class='del'>-		print_text_size(pc, 24, buf, ALIGN_CENTRE, l+3, r, t-3, b);</div><div class='del'>-#endif</div><div class='del'>-		gnome_print_showpage(pc);</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'>-	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, _("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'>-	gtk_object_unref (GTK_OBJECT (gpm));</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 e88c4a8e01..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/print.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/print.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* Evolution calendar - Print support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@helixcode.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c<br/>deleted file mode 100644<br/>index 6bf56c7c57..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/prop.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/prop.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,932 +0,0 @@</div><div class='del'>-/* Calendar properties dialog box</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@kernel.org&gt;</div><div class='del'>- *          Federico Mena &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#ifdef HAVE_LANGINGO_H</div><div class='del'>-#include &lt;langinfo.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;locale.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "gnome-month-item.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "mark.h"</div><div class='del'>-</div><div class='del'>-/* These specify the page numbers in the preferences notebook */</div><div class='del'>-enum {</div><div class='del'>-	PROP_TIME_DISPLAY,</div><div class='del'>-	PROP_COLORS,</div><div class='del'>-	PROP_TODO,</div><div class='del'>-	PROP_ALARMS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkWidget *prop_win;		/* The preferences dialog */</div><div class='del'>-</div><div class='del'>-/* Widgets for the time display page */</div><div class='del'>-</div><div class='del'>-static GtkWidget *time_format_12;	/* Radio button for 12-hour format */</div><div class='del'>-static GtkWidget *time_format_24;	/* Radio button for 24-hour format */</div><div class='del'>-static GtkWidget *start_on_sunday;	/* Check button for weeks starting on Sunday */</div><div class='del'>-static GtkWidget *start_on_monday;	/* Check button for weeks starting on Monday */</div><div class='del'>-static GtkWidget *start_omenu;		/* Option menu for start of day */</div><div class='del'>-static GtkWidget *end_omenu;		/* Option menu for end of day */</div><div class='del'>-static GtkWidget *start_items[24];	/* Menu items for start of day menu */</div><div class='del'>-static GtkWidget *end_items[24];	/* Menu items for end of day menu */</div><div class='del'>-</div><div class='del'>-/* Widgets for the colors page */</div><div class='del'>-</div><div class='del'>-static GtkWidget *color_pickers[COLOR_PROP_LAST];</div><div class='del'>-static GnomeCanvasItem *month_item;</div><div class='del'>-</div><div class='del'>-/* Widgets for the todo page */</div><div class='del'>-static GtkWidget *due_date_show_button;</div><div class='del'>-</div><div class='del'>-static GtkWidget *todo_item_time_remaining_show_button;</div><div class='del'>-</div><div class='del'>-static GtkWidget *todo_item_highlight_overdue;</div><div class='del'>-static GtkWidget *todo_item_highlight_not_due_yet;</div><div class='del'>-static GtkWidget *todo_item_highlight_due_today;</div><div class='del'>-</div><div class='del'>-static GtkWidget *priority_show_button;</div><div class='del'>-</div><div class='del'>-/* Widgets for the alarm page */</div><div class='del'>-static GtkWidget *enable_display_beep;</div><div class='del'>-static GtkWidget *to_cb;</div><div class='del'>-static GtkWidget *to_spin;</div><div class='del'>-static GtkWidget *snooze_cb;</div><div class='del'>-static GtkWidget *snooze_spin;</div><div class='del'>-</div><div class='del'>-/* prototypes */</div><div class='del'>-static void prop_apply_alarms (void);</div><div class='del'>-static void create_alarm_page (void);</div><div class='del'>-static void to_cb_changed (GtkWidget* object, gpointer data);</div><div class='del'>-static void snooze_cb_changed (GtkWidget* object, gpointer data);</div><div class='del'>-</div><div class='del'>-GtkWidget* make_spin_button (int val, int low, int high);</div><div class='del'>-void ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm,</div><div class='del'>-		   enum AlarmType type, int y, gboolean sens,</div><div class='del'>-		   GtkSignalFunc dirty_func);</div><div class='del'>-void ee_store_alarm (CalendarAlarm *alarm, enum AlarmType type);</div><div class='del'>-</div><div class='del'>-/* Callback used when the property box is closed -- just sets the prop_win variable to null. */</div><div class='del'>-static int</div><div class='del'>-prop_cancel (void)</div><div class='del'>-{</div><div class='del'>-	prop_win = NULL;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the index of the active item in a menu */</div><div class='del'>-static int</div><div class='del'>-get_active_index (GtkWidget *menu)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *active;</div><div class='del'>-</div><div class='del'>-	active = gtk_menu_get_active (GTK_MENU (menu));</div><div class='del'>-	return GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (active)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Applies the settings in the time display page */</div><div class='del'>-static void</div><div class='del'>-prop_apply_time_display (void)</div><div class='del'>-{</div><div class='del'>-	/* Day begin/end */</div><div class='del'>-</div><div class='del'>-	day_begin = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (start_omenu)));</div><div class='del'>-	day_end   = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (end_omenu)));</div><div class='del'>-	gnome_config_set_int ("/calendar/Calendar/Day start", day_begin);</div><div class='del'>-	gnome_config_set_int ("/calendar/Calendar/Day end", day_end);</div><div class='del'>-</div><div class='del'>-	/* Time format */</div><div class='del'>-</div><div class='del'>-	am_pm_flag = GTK_TOGGLE_BUTTON (time_format_12)-&gt;active;</div><div class='del'>-	gnome_config_set_bool ("/calendar/Calendar/AM PM flag", am_pm_flag);</div><div class='del'>-</div><div class='del'>-	/* Week start */</div><div class='del'>-</div><div class='del'>-	week_starts_on_monday = GTK_TOGGLE_BUTTON (start_on_monday)-&gt;active;</div><div class='del'>-	gnome_config_set_bool ("/calendar/Calendar/Week starts on Monday", week_starts_on_monday);</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-	time_format_changed ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Applies the settings in the colors page */</div><div class='del'>-static void</div><div class='del'>-prop_apply_colors (void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *cspec;</div><div class='del'>-	gushort r, g, b;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; COLOR_PROP_LAST; i++) {</div><div class='del'>-		gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[i]), &amp;r, &amp;g, &amp;b, NULL);</div><div class='del'>-		color_props[i].r = r;</div><div class='del'>-		color_props[i].g = g;</div><div class='del'>-		color_props[i].b = b;</div><div class='del'>-		</div><div class='del'>-		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);</div><div class='del'>-		gnome_config_set_string (color_props[i].key, cspec);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-	colors_changed ();</div><div class='del'>-}</div><div class='del'>-/* Applies the settings in the todo page (FIX THIS IF ITS NOT WRITTEN) */</div><div class='del'>-static void</div><div class='del'>-prop_apply_todo(void) </div><div class='del'>-{</div><div class='del'>-	todo_show_due_date = GTK_TOGGLE_BUTTON (due_date_show_button)-&gt;active;</div><div class='del'>-	</div><div class='del'>-	todo_item_dstatus_highlight_overdue = GTK_TOGGLE_BUTTON(todo_item_highlight_overdue)-&gt;active;</div><div class='del'>-	todo_item_dstatus_highlight_not_due_yet = GTK_TOGGLE_BUTTON(todo_item_highlight_not_due_yet)-&gt;active;</div><div class='del'>-	todo_item_dstatus_highlight_due_today = GTK_TOGGLE_BUTTON(todo_item_highlight_due_today)-&gt;active;</div><div class='del'>-</div><div class='del'>-	todo_show_priority = GTK_TOGGLE_BUTTON (priority_show_button)-&gt;active;</div><div class='del'>-</div><div class='del'>-	todo_show_time_remaining = GTK_TOGGLE_BUTTON (todo_item_time_remaining_show_button)-&gt;active;</div><div class='del'>-</div><div class='del'>-	/* storing the values */</div><div class='del'>-</div><div class='del'>-	gnome_config_set_bool("/calendar/Todo/show_time_remain", todo_show_time_remaining);</div><div class='del'>-	gnome_config_set_bool("/calendar/Todo/highlight_overdue", todo_item_dstatus_highlight_overdue);</div><div class='del'>-	</div><div class='del'>-	gnome_config_set_bool("/calendar/Todo/highlight_due_today", todo_item_dstatus_highlight_due_today);</div><div class='del'>-	</div><div class='del'>-        gnome_config_set_bool("/calendar/Todo/highlight_not_due_yet", todo_item_dstatus_highlight_not_due_yet);</div><div class='del'>-	gnome_config_set_bool("/calendar/Todo/show_due_date", todo_show_due_date);</div><div class='del'>-	gnome_config_set_bool("/calendar/Todo/show_priority", todo_show_priority);</div><div class='del'>-	/* need to sync our config changes. */</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-</div><div class='del'>-	/* apply the current changes */</div><div class='del'>-	todo_properties_changed();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the Apply button is clicked. */</div><div class='del'>-static void</div><div class='del'>-prop_apply (GtkWidget *w, int page)</div><div class='del'>-{</div><div class='del'>-	switch (page) {</div><div class='del'>-	case PROP_TIME_DISPLAY:</div><div class='del'>-		prop_apply_time_display ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROP_COLORS:</div><div class='del'>-		prop_apply_colors ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROP_TODO:</div><div class='del'>-	        prop_apply_todo ();</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case PROP_ALARMS:</div><div class='del'>-		prop_apply_alarms ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case -1:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("We have a loose penguin!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Notifies the property box that the data has changed */</div><div class='del'>-static void</div><div class='del'>-prop_changed (void)</div><div class='del'>-{</div><div class='del'>-	gnome_property_box_changed (GNOME_PROPERTY_BOX (prop_win));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds and returns a two-element radio button group surrounded by a frame.  The radio buttons are</div><div class='del'>- * stored in the specified variables, and the first radio button's state is set according to the</div><div class='del'>- * specified flag value.  The buttons are connected to the prop_changed() function to update the property</div><div class='del'>- * box's dirty state.</div><div class='del'>- */</div><div class='del'>-static GtkWidget *</div><div class='del'>-build_two_radio_group (char *title,</div><div class='del'>-		       char *radio_1_title, GtkWidget **radio_1_widget,</div><div class='del'>-		       char *radio_2_title, GtkWidget **radio_2_widget,</div><div class='del'>-		       int radio_1_value)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new (title);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), vbox);</div><div class='del'>-</div><div class='del'>-	*radio_1_widget = gtk_radio_button_new_with_label (NULL, radio_1_title);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), *radio_1_widget, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	*radio_2_widget = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (*radio_1_widget),</div><div class='del'>-								       radio_2_title);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), *radio_2_widget, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (*radio_1_widget), radio_1_value);</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (*radio_2_widget), !radio_1_value);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (*radio_1_widget), "toggled",</div><div class='del'>-			    (GtkSignalFunc) prop_changed,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	return frame;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback invoked when a menu item from the start/end time option menus is selected.  It adjusts</div><div class='del'>- * the other menu to the proper time, if needed.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-hour_activated (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int start, end;</div><div class='del'>-</div><div class='del'>-	if (data == start_omenu) {</div><div class='del'>-		/* Adjust the end menu */</div><div class='del'>-</div><div class='del'>-		start = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (widget)));</div><div class='del'>-		end = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (end_omenu)));</div><div class='del'>-</div><div class='del'>-		if (end &lt; start)</div><div class='del'>-			gtk_option_menu_set_history (GTK_OPTION_MENU (end_omenu), start);</div><div class='del'>-	} else if (data == end_omenu) {</div><div class='del'>-		/* Adjust the start menu */</div><div class='del'>-</div><div class='del'>-		end = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (widget)));</div><div class='del'>-		start = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (start_omenu)));</div><div class='del'>-</div><div class='del'>-		if (start &gt; end)</div><div class='del'>-			gtk_option_menu_set_history (GTK_OPTION_MENU (start_omenu), end);</div><div class='del'>-	} else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	gnome_property_box_changed (GNOME_PROPERTY_BOX (prop_win));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds an option menu of 24 hours */</div><div class='del'>-static GtkWidget *</div><div class='del'>-build_hours_menu (GtkWidget **items, int active)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	int i;</div><div class='del'>-	char buf[100];</div><div class='del'>-	struct tm tm;</div><div class='del'>-	int am_pm_flag;</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'>-	am_pm_flag = GTK_TOGGLE_BUTTON (time_format_12)-&gt;active;</div><div class='del'>-</div><div class='del'>-	memset (&amp;tm, 0, sizeof (tm));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 24; i++) {</div><div class='del'>-		tm.tm_hour = i;</div><div class='del'>-		if (am_pm_flag)</div><div class='del'>-			strftime (buf, 100, "%I:%M %p", &amp;tm);</div><div class='del'>-		else</div><div class='del'>-			strftime (buf, 100, "%H:%M", &amp;tm);</div><div class='del'>-</div><div class='del'>-		items[i] = gtk_menu_item_new_with_label (buf);</div><div class='del'>-		gtk_object_set_user_data (GTK_OBJECT (items[i]), GINT_TO_POINTER (i));</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (items[i]), "activate",</div><div class='del'>-				    (GtkSignalFunc) hour_activated,</div><div class='del'>-				    omenu);</div><div class='del'>-</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), items[i]);</div><div class='del'>-		gtk_widget_show (items[i]);</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'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), active);</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the time display page in the preferences dialog */</div><div class='del'>-static void</div><div class='del'>-create_time_display_page (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *hbox2;</div><div class='del'>-	GtkWidget *hbox3;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	table = gtk_table_new (2, 2, FALSE);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (table), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_table_set_row_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);</div><div class='del'>-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), table,</div><div class='del'>-					gtk_label_new (_("Time display")));</div><div class='del'>-</div><div class='del'>-	/* Time format */</div><div class='del'>-</div><div class='del'>-	w = build_two_radio_group (_("Time format"),</div><div class='del'>-				   _("12-hour (AM/PM)"), &amp;time_format_12,</div><div class='del'>-				   _("24-hour"), &amp;time_format_24,</div><div class='del'>-				   am_pm_flag);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), w,</div><div class='del'>-			  0, 1, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	/* Weeks start on */</div><div class='del'>-</div><div class='del'>-	w = build_two_radio_group (_("Weeks start on"),</div><div class='del'>-				   _("Sunday"), &amp;start_on_sunday,</div><div class='del'>-				   _("Monday"), &amp;start_on_monday,</div><div class='del'>-				   !week_starts_on_monday);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), w,</div><div class='del'>-			  0, 1, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	/* Day range */</div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new (_("Day range"));</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), frame,</div><div class='del'>-			  1, 2, 0, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), vbox);</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("Please select the start and end hours you want\n"</div><div class='del'>-			     "to be displayed in the day view and week view.\n"</div><div class='del'>-			     "Times outside this range will not be displayed\n"</div><div class='del'>-			     "by default."));</div><div class='del'>-	gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	hbox2 = gtk_hbox_new (FALSE, GNOME_PAD);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Day start */</div><div class='del'>-</div><div class='del'>-	hbox3 = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("Day start:"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox3), w, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	start_omenu = build_hours_menu (start_items, day_begin);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox3), start_omenu, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Day end */</div><div class='del'>-</div><div class='del'>-	hbox3 = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (_("Day end:"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox3), w, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	end_omenu = build_hours_menu (end_items, day_end);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox3), end_omenu, FALSE, FALSE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when the canvas for the month item is size allocated.  We use this to change the canvas'</div><div class='del'>- * scrolling region and the month item's size.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gnome_canvas_item_set (month_item,</div><div class='del'>-			       "width", (double) (allocation-&gt;width - 1),</div><div class='del'>-			       "height", (double) (allocation-&gt;height - 1),</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (widget),</div><div class='del'>-					0, 0,</div><div class='del'>-					allocation-&gt;width, allocation-&gt;height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns a color spec based on the color pickers */</div><div class='del'>-static char *</div><div class='del'>-color_spec_from_picker (int num)</div><div class='del'>-{</div><div class='del'>-	gushort r, g, b;</div><div class='del'>-</div><div class='del'>-	gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[num]), &amp;r, &amp;g, &amp;b, NULL);</div><div class='del'>-</div><div class='del'>-	return build_color_spec (r, g, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used to query color information for the properties box */</div><div class='del'>-static char *</div><div class='del'>-fetch_color_spec (ColorProp propnum, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return color_spec_from_picker (propnum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Marks fake event days in the month item sample */</div><div class='del'>-static void</div><div class='del'>-fake_mark_days (void)</div><div class='del'>-{</div><div class='del'>-	static int day_nums[] = { 1, 4, 8, 16, 17, 18, 20, 25, 28 }; /* some random days */</div><div class='del'>-	int first_day_index;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	first_day_index = gnome_month_item_day2index (GNOME_MONTH_ITEM (month_item), 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (sizeof (day_nums) / sizeof (day_nums[0])); i++)</div><div class='del'>-		mark_month_item_index (GNOME_MONTH_ITEM (month_item), first_day_index + day_nums[i] - 1,</div><div class='del'>-				       fetch_color_spec, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Switches the month item to the current date and highlights the current day's number */</div><div class='del'>-static void</div><div class='del'>-set_current_day (void)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t t;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	int day_index;</div><div class='del'>-</div><div class='del'>-	/* Set the date */</div><div class='del'>-</div><div class='del'>-	t = time (NULL);</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (month_item,</div><div class='del'>-			       "year", tm.tm_year + 1900,</div><div class='del'>-			       "month", tm.tm_mon,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Highlight current day */</div><div class='del'>-</div><div class='del'>-	day_index = gnome_month_item_day2index (GNOME_MONTH_ITEM (month_item), tm.tm_mday);</div><div class='del'>-	item = gnome_month_item_num2child (GNOME_MONTH_ITEM (month_item), GNOME_MONTH_ITEM_DAY_LABEL + day_index);</div><div class='del'>-	gnome_canvas_item_set (item,</div><div class='del'>-			       "fill_color", color_spec_from_picker (COLOR_PROP_CURRENT_DAY_FG),</div><div class='del'>-			       "fontset", CURRENT_DAY_FONTSET,</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the version of a color spec query function that is appropriate for the preferences dialog */</div><div class='del'>-static char *</div><div class='del'>-prop_color_func (ColorProp propnum, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return color_spec_from_picker (propnum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the colors of the month item to the current prerences */</div><div class='del'>-static void</div><div class='del'>-reconfigure_month (void)</div><div class='del'>-{</div><div class='del'>-	colorify_month_item (GNOME_MONTH_ITEM (month_item), prop_color_func, NULL);</div><div class='del'>-	fake_mark_days ();</div><div class='del'>-	set_current_day ();</div><div class='del'>-</div><div class='del'>-	/* Reset prelighting information */</div><div class='del'>-</div><div class='del'>-	month_item_prepare_prelight (GNOME_MONTH_ITEM (month_item), fetch_color_spec, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a color is changed */</div><div class='del'>-static void</div><div class='del'>-color_set (void)</div><div class='del'>-{</div><div class='del'>-	reconfigure_month ();</div><div class='del'>-	prop_changed ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the colors page in the preferences dialog */</div><div class='del'>-static void</div><div class='del'>-create_colors_page (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new (_("Colors for display"));</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (frame), GNOME_PAD_SMALL);</div><div class='del'>-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), frame,</div><div class='del'>-					gtk_label_new (_("Colors")));</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), hbox);</div><div class='del'>-</div><div class='del'>-	table = gtk_table_new (COLOR_PROP_LAST, 2, FALSE);</div><div class='del'>-	gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Create the color pickers */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; COLOR_PROP_LAST; i++) {</div><div class='del'>-		/* Label */</div><div class='del'>-</div><div class='del'>-		w = gtk_label_new (_(color_props[i].label));</div><div class='del'>-		gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);</div><div class='del'>-		gtk_table_attach (GTK_TABLE (table), w,</div><div class='del'>-				  0, 1, i, i + 1,</div><div class='del'>-				  GTK_FILL, 0,</div><div class='del'>-				  0, 0);</div><div class='del'>-</div><div class='del'>-		/* Color picker */</div><div class='del'>-</div><div class='del'>-		color_pickers[i] = gnome_color_picker_new ();</div><div class='del'>-		gnome_color_picker_set_title (GNOME_COLOR_PICKER (color_pickers[i]), _(color_props[i].label));</div><div class='del'>-		gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (color_pickers[i]),</div><div class='del'>-					    color_props[i].r, color_props[i].g, color_props[i].b, 0);</div><div class='del'>-		gtk_table_attach (GTK_TABLE (table), color_pickers[i],</div><div class='del'>-				  1, 2, i, i + 1,</div><div class='del'>-				  0, 0,</div><div class='del'>-				  0, 0);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (color_pickers[i]), "color_set",</div><div class='del'>-				    (GtkSignalFunc) color_set,</div><div class='del'>-				    NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create the sample calendar */</div><div class='del'>-</div><div class='del'>-	w = gnome_canvas_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	month_item = gnome_month_item_new (gnome_canvas_root (GNOME_CANVAS (w)));</div><div class='del'>-	gnome_canvas_item_set (month_item,</div><div class='del'>-			       "start_on_monday", week_starts_on_monday,</div><div class='del'>-			       NULL);</div><div class='del'>-	reconfigure_month ();</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "size_allocate",</div><div class='del'>-			    canvas_size_allocate,</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'>-set_todo_page_options(void)</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  </div><div class='del'>-	while (gtk_events_pending ())</div><div class='del'>-		gtk_main_iteration ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-todo_option_set (void)</div><div class='del'>-{</div><div class='del'>-	prop_changed ();</div><div class='del'>-	set_todo_page_options ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the colors page in the preferences dialog */</div><div class='del'>-static GtkWidget *</div><div class='del'>-build_list_options_frame(void) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	frame = gtk_frame_new (_("Show on TODO List:"));</div><div class='del'>-	</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), vbox);</div><div class='del'>-	</div><div class='del'>-	due_date_show_button = gtk_check_button_new_with_label (_("Due Date"));</div><div class='del'>-	priority_show_button = gtk_check_button_new_with_label (_("Priority"));</div><div class='del'>-	todo_item_time_remaining_show_button = gtk_check_button_new_with_label (_("Time Until Due"));</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(due_date_show_button), todo_show_due_date);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(due_date_show_button),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    (GtkSignalFunc) todo_option_set,</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), due_date_show_button, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_time_remaining_show_button), todo_show_time_remaining);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(todo_item_time_remaining_show_button),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    (GtkSignalFunc) todo_option_set,</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_time_remaining_show_button, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(priority_show_button), todo_show_priority);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(priority_show_button), </div><div class='del'>-			    "clicked",</div><div class='del'>-			    (GtkSignalFunc) todo_option_set,</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), priority_show_button, FALSE, FALSE, 0);</div><div class='del'>-	return frame;</div><div class='del'>-}</div><div class='del'>-static GtkWidget *</div><div class='del'>-build_style_list_options_frame(void) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new (_("To Do List style options:"));</div><div class='del'>-	</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), vbox);</div><div class='del'>-	</div><div class='del'>-	todo_item_highlight_overdue = gtk_check_button_new_with_label (_("Highlight overdue items"));</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_overdue),</div><div class='del'>-				     todo_item_dstatus_highlight_overdue);</div><div class='del'>-	todo_item_highlight_not_due_yet = gtk_check_button_new_with_label (_("Highlight not yet due items"));</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_not_due_yet),</div><div class='del'>-				     todo_item_dstatus_highlight_overdue);</div><div class='del'>-	todo_item_highlight_due_today = gtk_check_button_new_with_label (_("Highlight items due today"));</div><div class='del'>-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_due_today),</div><div class='del'>-				     todo_item_dstatus_highlight_overdue);</div><div class='del'>-		</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_overdue),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    (GtkSignalFunc) todo_option_set,</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_not_due_yet),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    (GtkSignalFunc) todo_option_set,</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_due_today),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    (GtkSignalFunc) todo_option_set,</div><div class='del'>-			    NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_overdue, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_due_today, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_not_due_yet, FALSE, FALSE, 0);</div><div class='del'>-	return frame;</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-create_todo_page (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *main_box;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new (_("To Do List Properties"));</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (frame), GNOME_PAD_SMALL);</div><div class='del'>-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), frame,</div><div class='del'>-					gtk_label_new (_("To Do List")));</div><div class='del'>-</div><div class='del'>-	/* first vbox*/</div><div class='del'>-	main_box = gtk_vbox_new(FALSE, GNOME_PAD);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), main_box);</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	/* first hbox*/</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (main_box), hbox);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX(hbox), build_list_options_frame(), FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX(hbox), build_style_list_options_frame(), FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>- 	set_todo_page_options(); </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates and displays the preferences dialog for the whole application */</div><div class='del'>-void</div><div class='del'>-properties (GtkWidget *toplevel)</div><div class='del'>-{</div><div class='del'>-        static GnomeHelpMenuEntry help_entry = { NULL, "properties" };</div><div class='del'>-</div><div class='del'>-	help_entry.name = gnome_app_id;</div><div class='del'>-</div><div class='del'>-	if (prop_win)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prop_win = gnome_property_box_new ();</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (prop_win), _("Preferences"));</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (prop_win),</div><div class='del'>-			 GTK_WINDOW (gtk_widget_get_toplevel (toplevel)));</div><div class='del'>-</div><div class='del'>-	create_time_display_page ();</div><div class='del'>-	create_colors_page ();</div><div class='del'>-	create_todo_page ();</div><div class='del'>-	create_alarm_page ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prop_win), "destroy",</div><div class='del'>-			    (GtkSignalFunc) prop_cancel, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prop_win), "delete_event",</div><div class='del'>-			    (GtkSignalFunc) prop_cancel, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prop_win), "apply",</div><div class='del'>-			    (GtkSignalFunc) prop_apply, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prop_win), "help",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_help_pbox_display),</div><div class='del'>-			    &amp;help_entry);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (prop_win);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-build_color_spec (int r, int g, int b)</div><div class='del'>-{</div><div class='del'>-	static char spec[100];</div><div class='del'>-</div><div class='del'>-	sprintf (spec, "#%04x%04x%04x", r, g, b);</div><div class='del'>-	return spec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-parse_color_spec (char *spec, int *r, int *g, int *b)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (spec != NULL);</div><div class='del'>-	g_return_if_fail (r != NULL);</div><div class='del'>-	g_return_if_fail (r != NULL);</div><div class='del'>-	g_return_if_fail (r != NULL);</div><div class='del'>-</div><div class='del'>-	if (sscanf (spec, "#%04x%04x%04x", r, g, b) != 3) {</div><div class='del'>-		g_warning ("Invalid color specification %s, returning black", spec);</div><div class='del'>-</div><div class='del'>-		*r = *g = *b = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-color_spec_from_prop (ColorProp propnum)</div><div class='del'>-{</div><div class='del'>-	return build_color_spec (color_props[propnum].r, color_props[propnum].g, color_props[propnum].b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_alarm_page (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *main_box;</div><div class='del'>-	GtkWidget *default_frame;</div><div class='del'>-	GtkWidget *default_table;</div><div class='del'>-	GtkWidget *misc_frame;</div><div class='del'>-	GtkWidget *misc_box;</div><div class='del'>-	GtkWidget *box, *l;</div><div class='del'>-</div><div class='del'>-	main_box = gtk_vbox_new (FALSE, GNOME_PAD);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);</div><div class='del'>-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), </div><div class='del'>-					main_box, gtk_label_new (_("Alarms")));</div><div class='del'>-</div><div class='del'>-	/* build miscellaneous box */</div><div class='del'>-	misc_frame = gtk_frame_new (_("Alarm Properties"));</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (misc_frame), </div><div class='del'>-					GNOME_PAD_SMALL);</div><div class='del'>-	misc_box = gtk_vbox_new (FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (misc_frame), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (misc_frame), misc_box);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (main_box), misc_frame, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	enable_display_beep = gtk_check_button_new_with_label (_("Beep on display alarms"));</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_display_beep),</div><div class='del'>-				      beep_on_display);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (misc_box), enable_display_beep, FALSE, FALSE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (enable_display_beep), "toggled",</div><div class='del'>-			    (GtkSignalFunc) prop_changed,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	/* audio timeout widgets */</div><div class='del'>-	box = gtk_hbox_new (FALSE, GNOME_PAD);</div><div class='del'>-	to_cb = gtk_check_button_new_with_label (_("Audio alarms timeout after"));</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (to_cb), </div><div class='del'>-				      enable_aalarm_timeout);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (to_cb), "toggled",</div><div class='del'>-			    (GtkSignalFunc) to_cb_changed, NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), to_cb, FALSE, FALSE, 0);</div><div class='del'>-	to_spin = make_spin_button (audio_alarm_timeout, 1, MAX_AALARM_TIMEOUT);</div><div class='del'>-	gtk_widget_set_sensitive (to_spin, enable_aalarm_timeout);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (to_spin), "changed",</div><div class='del'>-			    (GtkSignalFunc) prop_changed, NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), to_spin, FALSE, FALSE, 0);</div><div class='del'>-	l = gtk_label_new (_(" seconds"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (misc_box), box, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	/* snooze widgets */</div><div class='del'>-	box = gtk_hbox_new (FALSE, GNOME_PAD);</div><div class='del'>-	snooze_cb = gtk_check_button_new_with_label (_("Enable snoozing for "));</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (snooze_cb), </div><div class='del'>-				      enable_snooze);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (snooze_cb), "toggled",</div><div class='del'>-			    (GtkSignalFunc) snooze_cb_changed, NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), snooze_cb, FALSE, FALSE, 0);</div><div class='del'>-	snooze_spin = make_spin_button (snooze_secs, 1, MAX_SNOOZE_SECS);</div><div class='del'>-	gtk_widget_set_sensitive (snooze_spin, enable_snooze);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (snooze_spin), "changed",</div><div class='del'>-			    (GtkSignalFunc) prop_changed, NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), snooze_spin, FALSE, FALSE, 0);</div><div class='del'>-	l = gtk_label_new (_(" seconds"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (misc_box), box, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	/* populate default frame/box */</div><div class='del'>-	default_frame = gtk_frame_new (_("Defaults"));</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (default_frame), GNOME_PAD_SMALL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (main_box), default_frame, FALSE, FALSE, 0);</div><div class='del'>-	default_table = gtk_table_new (1, 1, 0);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (default_table), 4);</div><div class='del'>-	gtk_table_set_row_spacings (GTK_TABLE (default_table), 4);</div><div class='del'>-	gtk_table_set_col_spacings (GTK_TABLE (default_table), 4);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (default_frame), default_table);</div><div class='del'>-</div><div class='del'>-#warning "FIX ME"</div><div class='del'>-	/*</div><div class='del'>-	ee_create_ae (GTK_TABLE (default_table), _("Display"), </div><div class='del'>-		      &amp;alarm_defaults [ALARM_DISPLAY], ALARM_DISPLAY, 1, </div><div class='del'>-		      FALSE, prop_changed);</div><div class='del'>-	ee_create_ae (GTK_TABLE (default_table), _("Audio"), </div><div class='del'>-		      &amp;alarm_defaults [ALARM_AUDIO], ALARM_AUDIO, 2, </div><div class='del'>-		      FALSE, prop_changed);</div><div class='del'>-	ee_create_ae (GTK_TABLE (default_table), _("Program"), </div><div class='del'>-		      &amp;alarm_defaults [ALARM_PROGRAM], ALARM_PROGRAM, 3, </div><div class='del'>-		      FALSE, prop_changed);</div><div class='del'>-	ee_create_ae (GTK_TABLE (default_table), _("Mail"), </div><div class='del'>-		      &amp;alarm_defaults [ALARM_MAIL], ALARM_MAIL, 4, </div><div class='del'>-		      FALSE, prop_changed);</div><div class='del'>-	*/</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-prop_store_alarm_default_values (CalendarAlarm* alarm)</div><div class='del'>-{</div><div class='del'>-#warning "FIX ME"</div><div class='del'>-  //	ee_store_alarm (alarm, alarm-&gt;type);</div><div class='del'>-</div><div class='del'>-	switch (alarm-&gt;type) {</div><div class='del'>-	case ALARM_DISPLAY:</div><div class='del'>-		gnome_config_push_prefix ("/calendar/alarms/def_disp_");</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_AUDIO:</div><div class='del'>-		gnome_config_push_prefix ("/calendar/alarms/def_audio_");</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_PROGRAM:</div><div class='del'>-		gnome_config_push_prefix ("/calendar/alarms/def_prog_");</div><div class='del'>-		break;</div><div class='del'>-	case ALARM_MAIL:</div><div class='del'>-		gnome_config_push_prefix ("/calendar/alarms/def_mail_");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gnome_config_set_int ("enabled", alarm-&gt;enabled);</div><div class='del'>-	gnome_config_set_int ("count", alarm-&gt;count);</div><div class='del'>-	gnome_config_set_int ("units", alarm-&gt;units);</div><div class='del'>-	if (alarm-&gt;data)</div><div class='del'>-		gnome_config_set_string ("data", alarm-&gt;data);</div><div class='del'>-	</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-prop_apply_alarms ()</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i=0; i &lt; 4; i++)</div><div class='del'>-		prop_store_alarm_default_values (&amp;alarm_defaults [i]);</div><div class='del'>-</div><div class='del'>-	beep_on_display = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (enable_display_beep));</div><div class='del'>-	gnome_config_set_bool ("/calendar/alarms/beep_on_display", beep_on_display);</div><div class='del'>-	enable_aalarm_timeout = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (to_cb));</div><div class='del'>-	gnome_config_set_bool ("/calendar/alarms/enable_audio_timeout", enable_aalarm_timeout);</div><div class='del'>-	audio_alarm_timeout = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (to_spin));</div><div class='del'>-	gnome_config_set_int ("/calendar/alarms/audio_alarm_timeout", audio_alarm_timeout);</div><div class='del'>-	enable_snooze = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (snooze_cb));</div><div class='del'>-	gnome_config_set_bool ("/calendar/alarms/enable_snooze", enable_snooze);</div><div class='del'>-	snooze_secs = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (snooze_spin));</div><div class='del'>-	gnome_config_set_int ("/calendar/alarms/snooze_secs", snooze_secs);</div><div class='del'>-</div><div class='del'>-	gnome_config_sync();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-to_cb_changed (GtkWidget *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean active = </div><div class='del'>-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (to_cb));</div><div class='del'>-	gtk_widget_set_sensitive (to_spin, active);</div><div class='del'>-	prop_changed ();</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-snooze_cb_changed (GtkWidget *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean active =</div><div class='del'>-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (snooze_cb));</div><div class='del'>-	gtk_widget_set_sensitive (snooze_spin, active);</div><div class='del'>-	prop_changed ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/recur.xpm b/calendar/gui/recur.xpm<br/>deleted file mode 100644<br/>index 49836b62e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/recur.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/recur.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * recur_xpm[] = {</div><div class='del'>-"16 16 64 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #350000",</div><div class='del'>-"+	c #2A0000",</div><div class='del'>-"@	c #1B0000",</div><div class='del'>-"#	c #280000",</div><div class='del'>-"$	c #430000",</div><div class='del'>-"%	c #090000",</div><div class='del'>-"&amp;	c #160000",</div><div class='del'>-"*	c #250000",</div><div class='del'>-"=	c #460000",</div><div class='del'>-"-	c #550000",</div><div class='del'>-";	c #610000",</div><div class='del'>-"&gt;	c #0D0000",</div><div class='del'>-",	c #1F0000",</div><div class='del'>-"'	c #4B0000",</div><div class='del'>-")	c #5E0000",</div><div class='del'>-"!	c #6B0000",</div><div class='del'>-"~	c #750000",</div><div class='del'>-"{	c #790000",</div><div class='del'>-"]	c #810000",</div><div class='del'>-"^	c #FFFF83",</div><div class='del'>-"/	c #FFFF89",</div><div class='del'>-"(	c #FFFF93",</div><div class='del'>-"_	c #8B0000",</div><div class='del'>-":	c #900000",</div><div class='del'>-"&lt;	c #930000",</div><div class='del'>-"[	c #FFFF62",</div><div class='del'>-"}	c #A10000",</div><div class='del'>-"|	c #FFFF41",</div><div class='del'>-"1	c #FFFF3B",</div><div class='del'>-"2	c #FFFF31",</div><div class='del'>-"3	c #B70000",</div><div class='del'>-"4	c #B20000",</div><div class='del'>-"5	c #AE0000",</div><div class='del'>-"6	c #FFFF22",</div><div class='del'>-"7	c #FFFF16",</div><div class='del'>-"8	c #FFFF06",</div><div class='del'>-"9	c #C90000",</div><div class='del'>-"0	c #C10000",</div><div class='del'>-"a	c #BB0000",</div><div class='del'>-"b	c #FFF600",</div><div class='del'>-"c	c #FFE100",</div><div class='del'>-"d	c #FFC500",</div><div class='del'>-"e	c #E40000",</div><div class='del'>-"f	c #D70000",</div><div class='del'>-"g	c #CD0000",</div><div class='del'>-"h	c #FFDB00",</div><div class='del'>-"i	c #FFA900",</div><div class='del'>-"j	c #FF8500",</div><div class='del'>-"k	c #FF5900",</div><div class='del'>-"l	c #FF2800",</div><div class='del'>-"m	c #FC0000",</div><div class='del'>-"n	c #ED0000",</div><div class='del'>-"o	c #E10000",</div><div class='del'>-"p	c #FFAF00",</div><div class='del'>-"q	c #FF9400",</div><div class='del'>-"r	c #FF7400",</div><div class='del'>-"s	c #FF5000",</div><div class='del'>-"t	c #FF0100",</div><div class='del'>-"u	c #F30000",</div><div class='del'>-"v	c #E80000",</div><div class='del'>-"w	c #FF6900",</div><div class='del'>-"x	c #FF4900",</div><div class='del'>-"y	c #FF0800",</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'>-"       &amp;. !{]   ",</div><div class='del'>-"  ^/(   .  _:&lt;  ",</div><div class='del'>-"  [[[      }}}  ",</div><div class='del'>-"  |12      345  ",</div><div class='del'>-"  678      90a  ",</div><div class='del'>-"   bcd    efg   ",</div><div class='del'>-"   hdijklmnof   ",</div><div class='del'>-"    pqrsltuv    ",</div><div class='del'>-"      wxly      ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/calendar/gui/test.vcf b/calendar/gui/test.vcf<br/>deleted file mode 100644<br/>index bfe93b3c14..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/test.vcf?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/test.vcf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-BEGIN:VCALENDAR</div><div class='del'>-PRODID:-//GNOME//NONSGML GnomeCalendar//EN</div><div class='del'>-TZ:MST</div><div class='del'>-VERSION:0.13</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 846930886</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980601T150000 </div><div class='del'>-DTEND:19980601T150000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980402T023558 </div><div class='del'>-SUMMARY:Cada dos dias de 06/01 al 07/01</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D2 19980701T140000  </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 846930886</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980501T140000 </div><div class='del'>-DTEND:19980501T140000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980402T023558 </div><div class='del'>-SUMMARY:5 dias.</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 #5 </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 846930886</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980501T140000 </div><div class='del'>-DTEND:19980501T150000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980429T004635 </div><div class='del'>-SUMMARY:Diariamente de 05/01 al 06/01</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PRIVATE</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 19980601T000000  </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 1804289383</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T010000 </div><div class='del'>-DTEND:19980415T013000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Diario durante 5 dias</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 #5 </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 1804289383</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T010000 </div><div class='del'>-DTEND:19980415T013000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Diario durante 5 dias</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 #5 </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:KOrganizer - 846930886</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T140000 </div><div class='del'>-DUE:19691231T180000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980402T023558 </div><div class='del'>-SUMMARY:Normal</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:KOrganizer - 1804289383</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T120000 </div><div class='del'>-DUE:19691231T180000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Semanal -- 4 semanas</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:W1 WE #4 </div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:KOrganizer - 1804289383</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T003000 </div><div class='del'>-DUE:19691231T180000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:W1 SU WE TH FR #10 </div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-END:VCALENDAR</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/test2.vcf b/calendar/gui/test2.vcf<br/>deleted file mode 100644<br/>index 6446507989..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/test2.vcf?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/test2.vcf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-BEGIN:VCALENDAR</div><div class='del'>-PRODID:-//GNOME//NONSGML GnomeCalendar//EN</div><div class='del'>-TZ:MST</div><div class='del'>-VERSION:0.13</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 8469308861</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980601T150000 </div><div class='del'>-DTEND:19980601T150000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980402T023558 </div><div class='del'>-SUMMARY:Cada dos dias de 06/01 al 07/01</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D2 19980701T140000  </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 8469308862</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980501T140000 </div><div class='del'>-DTEND:19980501T140000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980402T023558 </div><div class='del'>-SUMMARY:5 dias.</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 #5 </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 8469308863</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980501T140000 </div><div class='del'>-DTEND:19980501T150000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980429T004635 </div><div class='del'>-SUMMARY:Diariamente de 05/01 al 06/01</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PRIVATE</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 19980601T000000  </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 18042893834</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T010000 </div><div class='del'>-DTEND:19980415T013000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Diario durante 5 dias</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 #5 </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:KOrganizer - 18042893835</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T010000 </div><div class='del'>-DTEND:19980415T013000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Diario durante 5 dias</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:D1 #5 </div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:KOrganizer - 8469308866</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T140000 </div><div class='del'>-DUE:19691231T180000 </div><div class='del'>-DCREATED:19980402T023558 </div><div class='del'>-LAST-MODIFIED:19980402T023558 </div><div class='del'>-SUMMARY:Normal</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:KOrganizer - 18042893837</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T120000 </div><div class='del'>-DUE:19691231T180000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Semanal -- 4 semanas</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:W1 WE #4 </div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:KOrganizer - 18042893838</div><div class='del'>-SEQUENCE:1</div><div class='del'>-DTSTART:19980415T003000 </div><div class='del'>-DUE:19691231T180000 </div><div class='del'>-DCREATED:19980402T023552 </div><div class='del'>-LAST-MODIFIED:19980330T225948 </div><div class='del'>-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)</div><div class='del'>-STATUS:NEEDS ACTION</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-PRIORITY:0</div><div class='del'>-TRANSP:0</div><div class='del'>-RELATED-TO:0</div><div class='del'>-RRULE:W1 SU WE TH FR #10 </div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-END:VCALENDAR</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/todo-conduit-control-applet.c b/calendar/gui/todo-conduit-control-applet.c<br/>deleted file mode 100644<br/>index 54a26715ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/todo-conduit-control-applet.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/todo-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,287 +0,0 @@</div><div class='del'>-/* Control applet ("capplet") for the gnome-pilot todo conduit,             */</div><div class='del'>-/* based on                                                                 */</div><div class='del'>-/* gpilotd control applet ('capplet') for use with the GNOME control center */</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;capplet-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gpilotd/gpilotd-conduit-mgmt.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app.h&gt;</div><div class='del'>-#include &lt;gpilotd/gpilotd-app-dummy-callbacks.h&gt;</div><div class='del'>-</div><div class='del'>-#include "todo-conduit.h"</div><div class='del'>-</div><div class='del'>-/* tell changes callbacks to ignore changes or not */</div><div class='del'>-static gboolean ignore_changes=FALSE;</div><div class='del'>-</div><div class='del'>-/* capplet widget */</div><div class='del'>-static GtkWidget *capplet=NULL;</div><div class='del'>-</div><div class='del'>-/* host/device/pilot configuration windows */</div><div class='del'>-GtkWidget *cfgOptionsWindow=NULL;</div><div class='del'>-GtkWidget *cfgStateWindow=NULL;</div><div class='del'>-GtkWidget *dialogWindow=NULL;</div><div class='del'>-</div><div class='del'>-gboolean activated,org_activation_state;</div><div class='del'>-GnomePilotConduitMgmt *conduit;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, ConduitCfg *conduitCfg);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, ConduitCfg *conduitCfg);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, ConduitCfg *conduitCfg);</div><div class='del'>-</div><div class='del'>-static void readStateCfg(GtkWidget *w);</div><div class='del'>-static void setStateCfg(GtkWidget *w);</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doTrySettings(GtkWidget *widget, ConduitCfg *conduitCfg)</div><div class='del'>-{</div><div class='del'>-    readStateCfg(cfgStateWindow);</div><div class='del'>-    if(activated)</div><div class='del'>-      gpilotd_conduit_mgmt_enable(conduit,pilotId,GnomePilotConduitSyncTypeSynchronize);</div><div class='del'>-    else</div><div class='del'>-      gpilotd_conduit_mgmt_disable(conduit,pilotId);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings(GtkWidget *widget, ConduitCfg *conduitCfg)</div><div class='del'>-{</div><div class='del'>-    doTrySettings(widget, conduitCfg);</div><div class='del'>-    save_configuration(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings(GtkWidget *widget, ConduitCfg *conduitCfg)</div><div class='del'>-{</div><div class='del'>-    activated = org_activation_state;</div><div class='del'>-    setStateCfg(cfgStateWindow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_dir_callback (GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		     gint len, gint *position, void *data)</div><div class='del'>-{</div><div class='del'>-    gint i;</div><div class='del'>-    gchar *curname;</div><div class='del'>-</div><div class='del'>-    curname = gtk_entry_get_text(GTK_ENTRY(editable));</div><div class='del'>-    if (*curname == '\0' &amp;&amp; len &gt; 0) {</div><div class='del'>-	if (isspace(text[0])) {</div><div class='del'>-	    gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");</div><div class='del'>-	    return;</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='del'>-	    if (isspace(text[i])) {</div><div class='del'>-		gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), </div><div class='del'>-					     "insert_text");</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'>-insert_dir_callback2(GtkEditable    *editable, const gchar    *text,</div><div class='del'>-		      gint            length, gint           *position,</div><div class='del'>-		      void *data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-        capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clist_changed(GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-    if (!ignore_changes)</div><div class='del'>-	capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-void about_cb (GtkWidget *widget, gpointer data) {</div><div class='del'>-  GtkWidget *about;</div><div class='del'>-  const gchar *authors[] = {_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"),NULL};</div><div class='del'>-  </div><div class='del'>-  about = gnome_about_new(_("Gpilotd todo conduit"), VERSION,</div><div class='del'>-			  _("(C) 1998 the Free Software Foundation"),</div><div class='del'>-			  authors,</div><div class='del'>-			  _("Configuration utility for the todo conduit.\n"),</div><div class='del'>-			  _("gnome-unknown.xpm"));</div><div class='del'>-  gtk_widget_show (about);</div><div class='del'>-  </div><div class='del'>-  return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void toggled_cb(GtkWidget *widget, gpointer data) {</div><div class='del'>-  gtk_widget_set_sensitive(cfgOptionsWindow,GTK_TOGGLE_BUTTON(widget)-&gt;active);</div><div class='del'>-  capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget</div><div class='del'>-*createStateCfgWindow(void)</div><div class='del'>-{</div><div class='del'>-    GtkWidget *vbox, *table;</div><div class='del'>-    GtkWidget *entry, *label;</div><div class='del'>-    GtkWidget *button;</div><div class='del'>-</div><div class='del'>-    vbox = gtk_vbox_new(FALSE, GNOME_PAD);</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_table_set_col_spacings(GTK_TABLE(table), 10);</div><div class='del'>-    gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-    label = gtk_label_new(_("Enabled"));</div><div class='del'>-    gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1,2);</div><div class='del'>-</div><div class='del'>-    button = gtk_check_button_new();</div><div class='del'>-    gtk_object_set_data(GTK_OBJECT(vbox), "conduit_on_off", button);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(button), "toggled",</div><div class='del'>-		       GTK_SIGNAL_FUNC(toggled_cb),</div><div class='del'>-		       NULL);</div><div class='del'>-    gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 1,2);</div><div class='del'>-</div><div class='del'>-    return vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg(GtkWidget *cfg)</div><div class='del'>-{</div><div class='del'>-    GtkWidget *button;</div><div class='del'>-    gchar num[40];</div><div class='del'>-</div><div class='del'>-    button = gtk_object_get_data(GTK_OBJECT(cfg), "conduit_on_off");</div><div class='del'>-</div><div class='del'>-    g_assert(button!=NULL);</div><div class='del'>-</div><div class='del'>-    ignore_changes = TRUE;</div><div class='del'>-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),activated);</div><div class='del'>-    gtk_widget_set_sensitive(cfgOptionsWindow,GTK_TOGGLE_BUTTON(button)-&gt;active);</div><div class='del'>-    ignore_changes = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-readStateCfg(GtkWidget *cfg)</div><div class='del'>-{</div><div class='del'>-  GtkWidget *button;</div><div class='del'>-</div><div class='del'>-  button  = gtk_object_get_data(GTK_OBJECT(cfg), "conduit_on_off");</div><div class='del'>-  </div><div class='del'>-  g_assert(button!=NULL);</div><div class='del'>-</div><div class='del'>-  activated = GTK_TOGGLE_BUTTON(button)-&gt;active;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pilot_capplet_setup(void)</div><div class='del'>-{</div><div class='del'>-    GtkWidget *frame, *table;</div><div class='del'>-</div><div class='del'>-    capplet = capplet_widget_new();</div><div class='del'>-</div><div class='del'>-    table = gtk_table_new(1, 2, FALSE);</div><div class='del'>-    gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);</div><div class='del'>-    gtk_container_add(GTK_CONTAINER(capplet), table); </div><div class='del'>-</div><div class='del'>-    frame = gtk_frame_new(_("Conduit state"));</div><div class='del'>-    gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);</div><div class='del'>-    gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);</div><div class='del'>-    cfgStateWindow = createStateCfgWindow();</div><div class='del'>-    gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);</div><div class='del'>-</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "try",</div><div class='del'>-			GTK_SIGNAL_FUNC(doTrySettings), NULL);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			GTK_SIGNAL_FUNC(doRevertSettings), NULL);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			GTK_SIGNAL_FUNC(doSaveSettings), NULL);</div><div class='del'>-    gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			GTK_SIGNAL_FUNC(about_cb), NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    setStateCfg(cfgStateWindow);</div><div class='del'>-</div><div class='del'>-    gtk_widget_show_all(capplet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void run_error_dialog(gchar *mesg,...) {</div><div class='del'>-  char tmp[80];</div><div class='del'>-  va_list ap;</div><div class='del'>-</div><div class='del'>-  va_start(ap,mesg);</div><div class='del'>-  vsnprintf(tmp,79,mesg,ap);</div><div class='del'>-  dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);</div><div class='del'>-  gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));</div><div class='del'>-  va_end(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint get_pilot_id_from_gpilotd() {</div><div class='del'>-	gint *pilots;</div><div class='del'>-	int i;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	gpilotd_get_pilot_ids(&amp;pilots);</div><div class='del'>-	if(pilots) {</div><div class='del'>-		while(pilots[i]!=-1) { g_message("pilot %d = \"%d\"",i,pilots[i]); i++; }</div><div class='del'>-		if(i==0) {</div><div class='del'>-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			if(i==1) </div><div class='del'>-				return pilots[0];</div><div class='del'>-			else {</div><div class='del'>-				g_message("too many pilots...");</div><div class='del'>-				return pilots[0];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));</div><div class='del'>-		return -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'>-    /* we're a capplet */</div><div class='del'>-    gnome_capplet_init ("todo conduit control applet", NULL, argc, argv, </div><div class='del'>-			NULL,</div><div class='del'>-			0, NULL);</div><div class='del'>-</div><div class='del'>-    /* put all code to set things up in here */</div><div class='del'>-    conduit = gpilotd_conduit_mgmt_new("todo_conduit");</div><div class='del'>-</div><div class='del'>-    /* get pilot name from gpilotd */</div><div class='del'>-    /* 1. initialize the gpilotd connection */</div><div class='del'>-    if (gpilotd_init(&amp;argc,argv)!=0) {</div><div class='del'>-	    run_error_dialog(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-	    g_error(_("Cannot initialze the GnomePilot Daemon"));</div><div class='del'>-	    return -1;</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    /* 2 connect to gpilotd */</div><div class='del'>-    if (gpilotd_connect()!=0) {</div><div class='del'>-	    run_error_dialog(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-	    g_error(_("Cannot connect to the GnomePilot Daemon"));</div><div class='del'>-	    return -1;</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    pilotId = get_pilot_id_from_gpilotd();</div><div class='del'>-    if(!pilotId) return -1;</div><div class='del'>-    org_activation_state = activated = gpilotd_conduit_mgmt_is_enabled(conduit,pilotId);</div><div class='del'>-    </div><div class='del'>-    pilot_capplet_setup();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    /* done setting up, now run main loop */</div><div class='del'>-    capplet_gtk_main();</div><div class='del'>-    return 0;</div><div class='del'>-}    </div><div class='head'>diff --git a/calendar/gui/todo-conduit-control-applet.desktop b/calendar/gui/todo-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index a817e16843..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/todo-conduit-control-applet.desktop?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/todo-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Todo conduit </div><div class='del'>-Name[da]=Udstående</div><div class='del'>-Name[no]=Oppgaver</div><div class='del'>-Comment=Configure the todo conduit</div><div class='del'>-Comment[da]=Konfigurér Udstående</div><div class='del'>-Comment[no]=Konfigurér oppgavelisten</div><div class='del'>-Exec=todo-conduit-control-applet --cap-id=1</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</div><div class='head'>diff --git a/calendar/gui/todo-conduit.c b/calendar/gui/todo-conduit.c<br/>deleted file mode 100644<br/>index 3a543816af..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/todo-conduit.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/todo-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,256 +0,0 @@</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</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-file.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;pi-version.h&gt;</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;utime.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-standard-abs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "todo-conduit.h"</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-load_records(GnomePilotConduit *c)</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'>-pre_sync(GnomePilotConduit *c, GnomePilotDBInfo *dbi) {</div><div class='del'>-  int l;</div><div class='del'>-  unsigned char *buf;</div><div class='del'>-</div><div class='del'>-  gtk_object_set_data(GTK_OBJECT(c),"dbinfo",dbi);</div><div class='del'>-  </div><div class='del'>-  load_records(c);</div><div class='del'>-</div><div class='del'>-  buf = (unsigned char*)g_malloc(0xffff);</div><div class='del'>-  if((l=dlp_ReadAppBlock(dbi-&gt;pilot_socket,dbi-&gt;db_handle,0,(unsigned char *)buf,0xffff))&lt;0) {</div><div class='del'>-    return -1;</div><div class='del'>-  }</div><div class='del'>-  unpack_ToDoAppInfo(&amp;(GET_DATA(c)-&gt;ai),buf,l);</div><div class='del'>-  g_free(buf);</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 *c) {</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match_record	(GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		 LocalRecord **local,</div><div class='del'>-		 PilotRecord *remote,</div><div class='del'>-		 gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("in match_record\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-free_match	(GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		 LocalRecord **local,</div><div class='del'>-		 gpointer data)</div><div class='del'>-{</div><div class='del'>-        g_print ("entering free_match\n");</div><div class='del'>-        *local = NULL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-archive_local (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	       LocalRecord *local,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering archive_local\n");</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-archive_remote (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		LocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering archive_remote\n");</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-store_remote (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	      PilotRecord *remote,</div><div class='del'>-	      gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering store_remote\n");</div><div class='del'>-        g_print ("Rec:%s:\nLength:%d\n", remote-&gt;record, remote-&gt;length);</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-clear_status_archive_local (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-			    LocalRecord *local,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering clear_status_archive_local\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-iterate (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	 LocalRecord **local,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering iterate\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-iterate_specific (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		  LocalRecord **local,</div><div class='del'>-		  gint flag,</div><div class='del'>-		  gint archived,</div><div class='del'>-		  gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering iterate_specific\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-purge (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-       gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering purge\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-set_status (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	    LocalRecord *local,</div><div class='del'>-	    gint status,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering set_status\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-set_archived (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	      LocalRecord *local,</div><div class='del'>-	      gint archived,</div><div class='del'>-	      gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering set_archived\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	      LocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering set_pilot_id\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	 LocalRecord *local,</div><div class='del'>-	 PilotRecord *remote,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering compare\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-compare_backup (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-		LocalRecord *local,</div><div class='del'>-		PilotRecord *remote,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering compare_backup\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-free_transmit (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	       LocalRecord *local,</div><div class='del'>-	       PilotRecord *remote,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering free_transmit\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-delete_all (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering delete_all\n");</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-static PilotRecord *</div><div class='del'>-transmit (GnomePilotConduitStandardAbs *pilot_conduit_standard_abs,</div><div class='del'>-	  LocalRecord *local,</div><div class='del'>-	  gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_print ("entering transmit\n");</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilotId)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	ConduitCfg *cfg;</div><div class='del'>-	ConduitData *cdata;</div><div class='del'>-</div><div class='del'>-	g_print ("creating our new conduit\n");</div><div class='del'>-	retval = gnome_pilot_conduit_standard_abs_new ("TodoDB", 0x0);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-	gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"todo");</div><div class='del'>-</div><div class='del'>-	cfg = g_new0(ConduitCfg,1);</div><div class='del'>-	g_assert(cfg != NULL);</div><div class='del'>-	gtk_object_set_data(retval,"conduit_cfg",cfg);</div><div class='del'>-</div><div class='del'>-	cdata = g_new0(ConduitData,1);</div><div class='del'>-	g_assert(cdata != NULL);</div><div class='del'>-	gtk_object_set_data(retval,"conduit_data",cdata);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, NULL);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, NULL);</div><div class='del'>-</div><div class='del'>-	load_configuration(&amp;cfg,pilotId);</div><div class='del'>-</div><div class='del'>-	return GNOME_PILOT_CONDUIT (retval);</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)</div><div class='del'>-{</div><div class='del'>-        ConduitCfg *cc;</div><div class='del'>-        cc = GET_CONFIG(conduit);</div><div class='del'>-        destroy_configuration(&amp;cc);</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/todo-conduit.h b/calendar/gui/todo-conduit.h<br/>deleted file mode 100644<br/>index c224b2b1f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/todo-conduit.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/todo-conduit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* $Id$ */</div><div class='del'>-</div><div class='del'>-#ifndef __TODO_CONDUIT_H__</div><div class='del'>-#define __TODO_CONDUIT_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;unistd.h&gt;</div><div class='del'>-#include &lt;pi-todo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _ConduitCfg ConduitCfg;</div><div class='del'>-</div><div class='del'>-struct _ConduitCfg {</div><div class='del'>-  gboolean open_secret;</div><div class='del'>-  guint32 pilotId;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define GET_CONFIG(c) ((ConduitCfg*)gtk_object_get_data(GTK_OBJECT(c),"conduit_cfg"))</div><div class='del'>-</div><div class='del'>-typedef struct _ConduitData ConduitData;</div><div class='del'>-</div><div class='del'>-struct _ConduitData {</div><div class='del'>-  struct ToDoAppInfo ai;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define GET_DATA(c) ((ConduitData*)gtk_object_get_data(GTK_OBJECT(c),"conduit_data"))</div><div class='del'>-</div><div class='del'>-static void load_configuration(ConduitCfg **c,guint32 pilotId) {</div><div class='del'>-  gchar prefix[256];</div><div class='del'>-  g_snprintf(prefix,255,"/gnome-pilot.d/todod-conduit/Pilot_%u/",pilotId);</div><div class='del'>-</div><div class='del'>-  *c = g_new0(ConduitCfg,1);</div><div class='del'>-  gnome_config_push_prefix(prefix);</div><div class='del'>-  (*c)-&gt;open_secret = gnome_config_get_bool("open secret=FALSE");</div><div class='del'>-  gnome_config_pop_prefix();</div><div class='del'>-</div><div class='del'>-  (*c)-&gt;pilotId = pilotId;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void save_configuration(ConduitCfg *c) {</div><div class='del'>-  gchar prefix[256];</div><div class='del'>-</div><div class='del'>-  g_snprintf(prefix,255,"/gnome-pilot.d/todo-conduit/Pilot_%u/",c-&gt;pilotId);</div><div class='del'>-</div><div class='del'>-  gnome_config_push_prefix(prefix);</div><div class='del'>-  gnome_config_set_bool("open secret",c-&gt;open_secret);</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 void destroy_configuration(ConduitCfg **c) {</div><div class='del'>-  g_free(*c);</div><div class='del'>-  *c = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif __TODO_CONDUIT_H__ </div><div class='head'>diff --git a/calendar/gui/topic.dat b/calendar/gui/topic.dat<br/>deleted file mode 100644<br/>index edc7813b26..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/topic.dat?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/topic.dat</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-gnome-cal.html		Manual</div><div class='del'>-gnome-cal.html#cmdline  Command line options 
\ No newline at end of file</div><div class='head'>diff --git a/calendar/gui/weekview.xpm b/calendar/gui/weekview.xpm<br/>deleted file mode 100644<br/>index f4900856eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/weekview.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/weekview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * weekview_xpm[] = {</div><div class='del'>-"24 24 14 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D1D1D1",</div><div class='del'>-"#	c #E3E4F5",</div><div class='del'>-"$	c #8B90C3",</div><div class='del'>-"%	c #AAAFE2",</div><div class='del'>-"&amp;	c #C7CAEB",</div><div class='del'>-"*	c #4550B5",</div><div class='del'>-"=	c #555FC5",</div><div class='del'>-"-	c #2E3BB1",</div><div class='del'>-";	c #0010A8",</div><div class='del'>-"&gt;	c #BABBCC",</div><div class='del'>-",	c #A3A6C7",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-" ...................... ",</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'>-" .@@@@@@@@@@--&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='head'>diff --git a/calendar/gui/workweekview.xpm b/calendar/gui/workweekview.xpm<br/>deleted file mode 100644<br/>index f47061589c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/workweekview.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/workweekview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * workweekview_xpm[] = {</div><div class='del'>-"24 24 16 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D1D1D1",</div><div class='del'>-"#	c #E3E4F5",</div><div class='del'>-"$	c #8B90C3",</div><div class='del'>-"%	c #AAAFE2",</div><div class='del'>-"&amp;	c #0010A8",</div><div class='del'>-"*	c #3945BB",</div><div class='del'>-"=	c #555FC5",</div><div class='del'>-"-	c #4550B5",</div><div class='del'>-";	c #727ACE",</div><div class='del'>-"&gt;	c #C7CAEB",</div><div class='del'>-",	c #2E3BB1",</div><div class='del'>-"'	c #5D66BA",</div><div class='del'>-")	c #BABBCC",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-" ...................... ",</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;$@@@@@@@@@@. ",</div><div class='del'>-" .++@++@+%&amp;;%$#+@++@++. ",</div><div class='del'>-" .++@++@+&gt;-==,;+@++@++. ",</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'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/calendar/gui/yearview.xpm b/calendar/gui/yearview.xpm<br/>deleted file mode 100644<br/>index 9629150417..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/yearview.xpm?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/gui/yearview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * yearview_xpm[] = {</div><div class='del'>-"24 24 18 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D1D1D1",</div><div class='del'>-"#	c #BABBCC",</div><div class='del'>-"$	c #AAAFE2",</div><div class='del'>-"%	c #8B90C3",</div><div class='del'>-"&amp;	c #E3E4F5",</div><div class='del'>-"*	c #C7CAEB",</div><div class='del'>-"=	c #5D66BA",</div><div class='del'>-"-	c #3945BB",</div><div class='del'>-";	c #555FC5",</div><div class='del'>-"&gt;	c #2E3BB1",</div><div class='del'>-",	c #727ACE",</div><div class='del'>-"'	c #4550B5",</div><div class='del'>-")	c #0010A8",</div><div class='del'>-"!	c #A3A6C7",</div><div class='del'>-"~	c #8E95D8",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</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;%$$%$+. ",</div><div class='del'>-" .+&amp;=-;&gt;,+#-;'*$)-;';+. ",</div><div class='del'>-" .@%)%@%)!&gt;=@@@%)%@@@@. ",</div><div class='del'>-" .++@*$=-$),$%&amp;$),$%&amp;+. ",</div><div class='del'>-" .++@~;&gt;,$)-;&gt;,*';;&gt;,+. ",</div><div class='del'>-" .@@@@@%)%)%@%)@@@@%)@. ",</div><div class='del'>-" .+$)$+%)$)$+%)&amp;%&amp;+%)+. ",</div><div class='del'>-" .+*&gt;,$=-*&gt;,$=-*&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='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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 b7340bf51a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/idl/evolution-calendar.idl?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/idl/evolution-calendar.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +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 Helix Code, 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@helixcode.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 Evolution {</div><div class='del'>-</div><div class='del'>-module Calendar {</div><div class='del'>-	/* A calendar object (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'>-</div><div class='del'>-	/* An unique identifier for a calendar object */</div><div class='del'>-	typedef string CalObjUID;</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'>-	/* 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_OTHER   = 1 &lt;&lt; 3;</div><div class='del'>-	const CalObjType TYPE_ANY     = 0x0f;</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 object 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'>-	typedef sequence&lt;CalObjInstance&gt; CalObjInstanceSeq;</div><div class='del'>-</div><div class='del'>-	/* An alarm trigger instance */</div><div class='del'>-	struct CalAlarmInstance {</div><div class='del'>-		CalObjUID uid;</div><div class='del'>-		AlarmType type;</div><div class='del'>-		Time_t trigger;</div><div class='del'>-		Time_t occur;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	typedef sequence&lt;CalAlarmInstance&gt; CalAlarmInstanceSeq;</div><div class='del'>-</div><div class='del'>-	interface Listener;</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'>-</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'>-		/* Gets the number of objects of the specified types */</div><div class='del'>-		long get_n_objects (in CalObjType type);</div><div class='del'>-</div><div class='del'>-		/* Gets an object based on its URI */</div><div class='del'>-		CalObj get_object (in CalObjUID uid)</div><div class='del'>-			raises (NotFound);</div><div class='del'>-</div><div class='del'>-		/* Gets a list of UIDs based on object type */</div><div class='del'>-		CalObjUIDSeq get_uids (in CalObjType type);</div><div class='del'>-</div><div class='del'>-		/* Gets the events that occur or recur in the specified time range */</div><div class='del'>-		CalObjInstanceSeq get_events_in_range (in Time_t start, in Time_t end)</div><div class='del'>-			raises (InvalidRange);</div><div class='del'>-</div><div class='del'>-		/* Gets the objects whose alarms trigger in the specified time</div><div class='del'>-		 * range.</div><div class='del'>-		 */</div><div class='del'>-		CalAlarmInstanceSeq get_alarms_in_range (in Time_t start, in Time_t end)</div><div class='del'>-			raises (InvalidRange);</div><div class='del'>-</div><div class='del'>-		/* Gets the alarms for the specified object that trigger in the</div><div class='del'>-		 * specified time range.</div><div class='del'>-		 */</div><div class='del'>-		CalAlarmInstanceSeq get_alarms_for_object (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'>-		/* Updates an object by adding it if it does not exist or by</div><div class='del'>-		 * changing an existing one.</div><div class='del'>-		 */</div><div class='del'>-		void update_object (in CalObjUID uid, in CalObj calobj)</div><div class='del'>-			raises (InvalidObject);</div><div class='del'>-</div><div class='del'>-		/* Removes an object */</div><div class='del'>-		void remove_object (in CalObjUID uid)</div><div class='del'>-			raises (NotFound);</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 loading a calendar; we need better error reporting */</div><div class='del'>-		enum LoadStatus {</div><div class='del'>-			SUCCESS,		/* All OK */</div><div class='del'>-			ERROR,			/* Generic error */</div><div class='del'>-			IN_USE,			/* Requested create while a calendar</div><div class='del'>-						 * with the same URI was in use.</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'>-		/* Called from a CalFactory when a calendar is initially loaded</div><div class='del'>-		 * or created.  The listener must remember the cal object.</div><div class='del'>-		 */</div><div class='del'>-		void cal_loaded (in LoadStatus status, in Cal cal);</div><div class='del'>-</div><div class='del'>-		/* Called from a Calendar when an object is added or changed */</div><div class='del'>-		void obj_updated (in CalObjUID uid);</div><div class='del'>-</div><div class='del'>-		/* Called from a Calendar when an object is removed */</div><div class='del'>-		void obj_removed (in CalObjUID uid);</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'>-</div><div class='del'>-		/* Load a calendar from an URI */</div><div class='del'>-		void load (in string uri, in Listener listener)</div><div class='del'>-			raises (NilListener);</div><div class='del'>-</div><div class='del'>-		/* Create a new calendar at the specified URI */</div><div class='del'>-		void create (in string uri, in Listener listener)</div><div class='del'>-			raises (NilListener);</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/pcs/.cvsignore b/calendar/pcs/.cvsignore<br/>deleted file mode 100644<br/>index 7250bfdff6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/.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'>-.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='del'>-icalendar-test</div><div class='head'>diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am<br/>deleted file mode 100644<br/>index 3299d15908..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +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'>-	$(BONOBO_GNOME_CFLAGS)				\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"</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 = `$(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-imc.c	\</div><div class='del'>-	cal-backend-imc.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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</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='head'>diff --git a/calendar/pcs/cal-backend-imc.c b/calendar/pcs/cal-backend-imc.c<br/>deleted file mode 100644<br/>index 7999d97d6e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-imc.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal-backend-imc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1350 +0,0 @@</div><div class='del'>-/* Evolution calendar - Internet Mail Consortium formats backend</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@helixcode.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "cal-backend-imc.h"</div><div class='del'>-#include "cal-util/icalendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Supported calendar formats from the IMC */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_FORMAT_UNKNOWN,</div><div class='del'>-	CAL_FORMAT_VCALENDAR,</div><div class='del'>-	CAL_FORMAT_ICALENDAR</div><div class='del'>-} CalendarFormat;</div><div class='del'>-</div><div class='del'>-/* Private part of the CalBackendIMC structure */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* URI where the calendar data is stored */</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-</div><div class='del'>-        /* Format of this calendar (iCalendar or vCalendar) */</div><div class='del'>-	CalendarFormat format;</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'>-	/* All the iCalObject structures in the calendar, hashed by UID.  The</div><div class='del'>-	 * hash key *is* icalobj-&gt;uid; it is not copied, so don't free it when</div><div class='del'>-	 * you remove an object from the hash table.</div><div class='del'>-	 */</div><div class='del'>-	GHashTable *object_hash;</div><div class='del'>-</div><div class='del'>-	/* All events, TODOs, and journals in the calendar */</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'>-	/* Whether a calendar has been loaded */</div><div class='del'>-	guint loaded : 1;</div><div class='del'>-</div><div class='del'>-	/* Do we need to sync to permanent storage? */</div><div class='del'>-	gboolean dirty : 1;</div><div class='del'>-} IMCPrivate;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_backend_imc_class_init (CalBackendIMCClass *class);</div><div class='del'>-static void cal_backend_imc_init (CalBackendIMC *bimc);</div><div class='del'>-static void cal_backend_imc_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GnomeVFSURI *cal_backend_imc_get_uri (CalBackend *backend);</div><div class='del'>-static void cal_backend_imc_add_cal (CalBackend *backend, Cal *cal);</div><div class='del'>-static CalBackendLoadStatus cal_backend_imc_load (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-static void cal_backend_imc_create (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-</div><div class='del'>-static int cal_backend_imc_get_n_objects (CalBackend *backend, CalObjType type);</div><div class='del'>-static char *cal_backend_imc_get_object (CalBackend *backend, const char *uid);</div><div class='del'>-static GList *cal_backend_imc_get_uids (CalBackend *backend, CalObjType type);</div><div class='del'>-static GList *cal_backend_imc_get_events_in_range (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-static GList *cal_backend_imc_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-static gboolean cal_backend_imc_get_alarms_for_object (CalBackend *backend, const char *uid,</div><div class='del'>-						       time_t start, time_t end,</div><div class='del'>-						       GList **alarms);</div><div class='del'>-static gboolean cal_backend_imc_update_object (CalBackend *backend, const char *uid,</div><div class='del'>-					       const char *calobj);</div><div class='del'>-static gboolean cal_backend_imc_remove_object (CalBackend *backend, const char *uid);</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_imc_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalBackendIMC 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 #CalBackendIMC class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_backend_imc_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_backend_imc_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_imc_type) {</div><div class='del'>-		static const GtkTypeInfo cal_backend_imc_info = {</div><div class='del'>-			"CalBackendIMC",</div><div class='del'>-			sizeof (CalBackendIMC),</div><div class='del'>-			sizeof (CalBackendIMCClass),</div><div class='del'>-			(GtkClassInitFunc) cal_backend_imc_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_backend_imc_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_imc_type = gtk_type_unique (CAL_BACKEND_TYPE, &amp;cal_backend_imc_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_backend_imc_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the IMC backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_imc_class_init (CalBackendIMCClass *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'>-	backend_class-&gt;get_uri = cal_backend_imc_get_uri;</div><div class='del'>-	backend_class-&gt;add_cal = cal_backend_imc_add_cal;</div><div class='del'>-	backend_class-&gt;load = cal_backend_imc_load;</div><div class='del'>-	backend_class-&gt;create = cal_backend_imc_create;</div><div class='del'>-	backend_class-&gt;get_n_objects = cal_backend_imc_get_n_objects;</div><div class='del'>-	backend_class-&gt;get_object = cal_backend_imc_get_object;</div><div class='del'>-	backend_class-&gt;get_uids = cal_backend_imc_get_uids;</div><div class='del'>-	backend_class-&gt;get_events_in_range = cal_backend_imc_get_events_in_range;</div><div class='del'>-	backend_class-&gt;get_alarms_in_range = cal_backend_imc_get_alarms_in_range;</div><div class='del'>-	backend_class-&gt;get_alarms_for_object = cal_backend_imc_get_alarms_for_object;</div><div class='del'>-	backend_class-&gt;update_object = cal_backend_imc_update_object;</div><div class='del'>-	backend_class-&gt;remove_object = cal_backend_imc_remove_object;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_backend_imc_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the IMC backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_imc_init (CalBackendIMC *cbimc)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (IMCPrivate, 1);</div><div class='del'>-	cbimc-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;format = CAL_FORMAT_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_to_vcal (CalBackendIMC *cbimc, char *fname)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	VObject *vcal;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (fname)) {</div><div class='del'>-		char *backup_name = g_strconcat (fname, "~", NULL);</div><div class='del'>-</div><div class='del'>-		/* FIXME: do error checking on system calls!!!! */</div><div class='del'>-</div><div class='del'>-		if (g_file_exists (backup_name))</div><div class='del'>-			unlink (backup_name);</div><div class='del'>-</div><div class='del'>-		rename (fname, backup_name);</div><div class='del'>-		g_free (backup_name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vcal = newVObject (VCCalProp);</div><div class='del'>-	addPropValue (vcal, VCProdIdProp,</div><div class='del'>-		      "-//Helix Code//NONSGML Evolution Calendar//EN");</div><div class='del'>-</div><div class='del'>-	/* Per the vCalendar spec, this must be "1.0" */</div><div class='del'>-	addPropValue (vcal, VCVersionProp, "1.0");</div><div class='del'>-</div><div class='del'>-	/* FIXME: this should really iterate over the object hash table instead</div><div class='del'>-	 * of the lists; that way we won't lose objects if they are of a type</div><div class='del'>-	 * that we don't support but are in the calendar anyways.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;events; l; l = l-&gt;next) {</div><div class='del'>-		iCalObject *ical = l-&gt;data;</div><div class='del'>-		VObject *vobject = ical_object_to_vobject (ical);</div><div class='del'>-		addVObjectProp (vcal, vobject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;todos; l; l = l-&gt;next) {</div><div class='del'>-		iCalObject *ical = l-&gt;data;</div><div class='del'>-		VObject *vobject = ical_object_to_vobject (ical);</div><div class='del'>-		addVObjectProp (vcal, vobject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;journals; l; l = l-&gt;next) {</div><div class='del'>-		iCalObject *ical = l-&gt;data;</div><div class='del'>-		VObject *vobject = ical_object_to_vobject (ical);</div><div class='del'>-		addVObjectProp (vcal, vobject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fp = fopen(fname,"w");</div><div class='del'>-	if (fp) {</div><div class='del'>-		writeVObject(fp, vcal);</div><div class='del'>-		fclose(fp);</div><div class='del'>-	}</div><div class='del'>-	cleanVObject (vcal);</div><div class='del'>-	cleanStrTbl ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves a calendar */</div><div class='del'>-static void</div><div class='del'>-save (CalBackendIMC *cbimc)</div><div class='del'>-{</div><div class='del'>-	char *str_uri;</div><div class='del'>-	IMCPrivate *priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	str_uri = gnome_vfs_uri_to_string (priv-&gt;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'>-	if (!priv-&gt;dirty)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;format) {</div><div class='del'>-	case CAL_FORMAT_VCALENDAR:</div><div class='del'>-		save_to_vcal (cbimc, str_uri);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_FORMAT_ICALENDAR:</div><div class='del'>-		/*icalendar_calendar_save (cbimc, str_uri);*/</div><div class='del'>-		/* FIX ME */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("save(): Attempt to save a calendar with an unknown format!");</div><div class='del'>-	        break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf ("cal-backend-imc: '%s' saved\n", str_uri);</div><div class='del'>-</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* g_hash_table_foreach() callback to destroy an iCalObject */</div><div class='del'>-static void</div><div class='del'>-free_ical_object (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	ico = value;</div><div class='del'>-	ical_object_unref (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroys an IMC backend's data */</div><div class='del'>-static void</div><div class='del'>-destroy (CalBackendIMC *cbimc)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;uri) {</div><div class='del'>-		gnome_vfs_uri_unref (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;clients == NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;object_hash) {</div><div class='del'>-		g_hash_table_foreach (priv-&gt;object_hash, free_ical_object, NULL);</div><div class='del'>-		g_hash_table_destroy (priv-&gt;object_hash);</div><div class='del'>-		priv-&gt;object_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'>-</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;loaded = FALSE;</div><div class='del'>-	priv-&gt;format = CAL_FORMAT_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the IMC backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_imc_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *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_BACKEND_IMC (object));</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (object);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	if (priv-&gt;loaded)</div><div class='del'>-		save (cbimc);</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	destroy (cbimc);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	cbimc-&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'>-/* iCalObject manipulation functions */</div><div class='del'>-</div><div class='del'>-/* Looks up an object by its UID in the backend's object hash table */</div><div class='del'>-static iCalObject *</div><div class='del'>-lookup_object (CalBackendIMC *cbimc, const char *uid)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-	ico = g_hash_table_lookup (priv-&gt;object_hash, uid);</div><div class='del'>-</div><div class='del'>-	return ico;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that an iCalObject has a unique identifier.  If it doesn't have one,</div><div class='del'>- * it will create one for it.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ensure_uid (iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	char *buf;</div><div class='del'>-	gulong str_time;</div><div class='del'>-	static guint seqno = 0;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;uid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	str_time = (gulong) time (NULL);</div><div class='del'>-</div><div class='del'>-	/* Is this good enough? */</div><div class='del'>-</div><div class='del'>-	buf = g_strdup_printf ("Evolution-Calendar-%d-%ld-%u",</div><div class='del'>-			       (int) getpid(), str_time, seqno++);</div><div class='del'>-	ico-&gt;uid = buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds an object to the calendar backend.  Does *not* perform notification to</div><div class='del'>- * calendar clients.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-add_object (CalBackendIMC *cbimc, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_assert (ico != NULL);</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* FIXME: gnomecal old code */</div><div class='del'>-	ico-&gt;new = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ensure_uid (ico);</div><div class='del'>-	g_hash_table_insert (priv-&gt;object_hash, ico-&gt;uid, ico);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	switch (ico-&gt;type) {</div><div class='del'>-	case ICAL_EVENT:</div><div class='del'>-		priv-&gt;events = g_list_prepend (priv-&gt;events, ico);</div><div class='del'>-#if 0</div><div class='del'>-		/* FIXME: gnomecal old code */</div><div class='del'>-		ical_object_try_alarms (ico);</div><div class='del'>-#  ifdef DEBUGGING_MAIL_ALARM</div><div class='del'>-		ico-&gt;malarm.trigger = 0;</div><div class='del'>-		calendar_notify (0, ico);</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_TODO:</div><div class='del'>-		priv-&gt;todos = g_list_prepend (priv-&gt;todos, ico);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_JOURNAL:</div><div class='del'>-		priv-&gt;journals = g_list_prepend (priv-&gt;journals, ico);</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 0</div><div class='del'>-	/* FIXME: gnomecal old code */</div><div class='del'>-	ico-&gt;last_mod = time (NULL);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes an object from the backend's hash and lists.  Does not perform</div><div class='del'>- * notification on the clients.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-remove_object (CalBackendIMC *cbimc, iCalObject *ico)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	GList **list, *l;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (ico-&gt;uid != NULL);</div><div class='del'>-	g_hash_table_remove (priv-&gt;object_hash, ico-&gt;uid);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	switch (ico-&gt;type) {</div><div class='del'>-	case ICAL_EVENT:</div><div class='del'>-		list = &amp;priv-&gt;events;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_TODO:</div><div class='del'>-		list = &amp;priv-&gt;todos;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_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, ico);</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'>-	ical_object_unref (ico);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Load a calendar from a VObject */</div><div class='del'>-static void</div><div class='del'>-load_from_vobject (CalBackendIMC *cbimc, VObject *vobject)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	VObjectIterator i;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (!priv-&gt;loaded);</div><div class='del'>-	g_assert (priv-&gt;object_hash == NULL);</div><div class='del'>-	priv-&gt;object_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	initPropIterator (&amp;i, vobject);</div><div class='del'>-</div><div class='del'>-	while (moreIteration (&amp;i)) {</div><div class='del'>-		VObject *this;</div><div class='del'>-		iCalObject *ical;</div><div class='del'>-		const char *object_name;</div><div class='del'>-</div><div class='del'>-		this = nextVObject (&amp;i);</div><div class='del'>-		object_name = vObjectName (this);</div><div class='del'>-#if 0</div><div class='del'>-		/* FIXME?  What is this used for in gnomecal? */</div><div class='del'>-		if (strcmp (object_name, VCDCreatedProp) == 0) {</div><div class='del'>-			cal-&gt;created = time_from_isodate (str_val (this));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		if (strcmp (object_name, VCLocationProp) == 0)</div><div class='del'>-			continue; /* FIXME: imlement */</div><div class='del'>-</div><div class='del'>-		if (strcmp (object_name, VCProdIdProp) == 0)</div><div class='del'>-			continue; /* FIXME: implement */</div><div class='del'>-</div><div class='del'>-		if (strcmp (object_name, VCVersionProp) == 0)</div><div class='del'>-			continue; /* FIXME: implement */</div><div class='del'>-</div><div class='del'>-		if (strcmp (object_name, VCTimeZoneProp) == 0)</div><div class='del'>-			continue; /* FIXME: implement */</div><div class='del'>-</div><div class='del'>-		ical = ical_object_create_from_vobject (this, object_name);</div><div class='del'>-</div><div class='del'>-		/* FIXME: some broken files (ahem, old KOrganizer files) may</div><div class='del'>-		 * have duplicated UIDs.  This is Bad(tm).  Deal with it by</div><div class='del'>-		 * creating new UIDs for them and spitting some messages to the</div><div class='del'>-		 * console.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (ical)</div><div class='del'>-			add_object (cbimc, ical);</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 backend methods */</div><div class='del'>-</div><div class='del'>-/* Get_uri handler for the IMC backend */</div><div class='del'>-static GnomeVFSURI *</div><div class='del'>-cal_backend_imc_get_uri (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;loaded, NULL);</div><div class='del'>-	g_assert (priv-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;uri;</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'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</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'>-	cbimc = CAL_BACKEND_IMC (data);</div><div class='del'>-	priv = cbimc-&gt;priv;</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 = priv-&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'>-	priv-&gt;clients = g_list_remove_link (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 (!priv-&gt;clients)</div><div class='del'>-		cal_backend_last_client_gone (CAL_BACKEND (cbimc));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add_cal handler for the IMC backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_imc_add_cal (CalBackend *backend, Cal *cal)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;loaded);</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'>-	/* We do not keep a reference to the Cal since the calendar user agent</div><div class='del'>-	 * owns it.</div><div class='del'>-	 */</div><div class='del'>-</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'>-	priv-&gt;clients = g_list_prepend (priv-&gt;clients, cal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalcomponent *</div><div class='del'>-icalendar_parse_file (char *fname)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-	icalcomponent *comp = NULL;</div><div class='del'>-	char *str;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	fp = fopen (fname, "r");</div><div class='del'>-	if (!fp) {</div><div class='del'>-		/* FIXME: remove message */</div><div class='del'>-		g_message ("icalendar_parse_file(): Cannot open open calendar file.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stat (fname, &amp;st);</div><div class='del'>-</div><div class='del'>-	str = g_malloc (st.st_size + 2);</div><div class='del'>-</div><div class='del'>-	n = fread (str, 1, st.st_size, fp);</div><div class='del'>-	if (n != st.st_size) {</div><div class='del'>-		/* FIXME: remove message, return error code instead */</div><div class='del'>-		g_message ("icalendar_parse_file(): Read error.");</div><div class='del'>-	}</div><div class='del'>-	str[n] = '\0';</div><div class='del'>-</div><div class='del'>-	fclose (fp);</div><div class='del'>-</div><div class='del'>-	comp = icalparser_parse_string (str);</div><div class='del'>-	g_free (str);</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'>-icalendar_calendar_load (CalBackendIMC *cbimc, char *fname)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	icalcomponent *comp;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-	iCalObject    *ical;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (!priv-&gt;loaded);</div><div class='del'>-	g_assert (priv-&gt;object_hash == NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;object_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	comp = icalendar_parse_file (fname);</div><div class='del'>-	subcomp = icalcomponent_get_first_component (comp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		ical = ical_object_create_from_icalcomponent (subcomp);</div><div class='del'>-		if (ical-&gt;type != ICAL_EVENT &amp;&amp;</div><div class='del'>-		    ical-&gt;type != ICAL_TODO  &amp;&amp;</div><div class='del'>-		    ical-&gt;type != ICAL_JOURNAL) {</div><div class='del'>-		       g_message ("icalendar_calendar_load(): Skipping unsupported "</div><div class='del'>-				  "iCalendar component.");</div><div class='del'>-		} else</div><div class='del'>-			add_object (cbimc, ical);</div><div class='del'>-</div><div class='del'>-		subcomp = icalcomponent_get_next_component (comp,</div><div class='del'>-							   ICAL_ANY_COMPONENT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ics is to be used to designate a file containing (an arbitrary set of)</div><div class='del'>- * calendaring and scheduling information.</div><div class='del'>- *</div><div class='del'>- * ifb is to be used to designate a file containing free or busy time</div><div class='del'>- * information.</div><div class='del'>- *</div><div class='del'>- * anything else is assumed to be a vcal file.</div><div class='del'>- *</div><div class='del'>- * FIXME: should we return UNKNOWN at some point?</div><div class='del'>- */</div><div class='del'>-static CalendarFormat</div><div class='del'>-cal_get_type_from_filename (char *str_uri)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (str_uri == NULL)</div><div class='del'>-		return CAL_FORMAT_VCALENDAR;</div><div class='del'>-</div><div class='del'>-	len = strlen (str_uri);</div><div class='del'>-	if (len &lt; 4)</div><div class='del'>-		return CAL_FORMAT_VCALENDAR;</div><div class='del'>-</div><div class='del'>-	if (str_uri[len - 4] == '.' &amp;&amp; str_uri[len - 3] == 'i' &amp;&amp;</div><div class='del'>-	    str_uri[len - 2] == 'c' &amp;&amp; str_uri[len - 1] == 's')</div><div class='del'>-		return CAL_FORMAT_ICALENDAR;</div><div class='del'>-</div><div class='del'>-	if (str_uri[len - 4] == '.' &amp;&amp; str_uri[len - 3] == 'i' &amp;&amp;</div><div class='del'>-	    str_uri[len - 2] == 'f' &amp;&amp; str_uri[len - 1] == 'b')</div><div class='del'>-		return CAL_FORMAT_ICALENDAR;</div><div class='del'>-</div><div class='del'>-	if (str_uri[len - 4] == '.' &amp;&amp; str_uri[len - 3] == 'i' &amp;&amp;</div><div class='del'>-	    str_uri[len - 2] == 'c' &amp;&amp; str_uri[len - 1] == 's')</div><div class='del'>-		return CAL_FORMAT_ICALENDAR;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 5)</div><div class='del'>-		return CAL_FORMAT_VCALENDAR;</div><div class='del'>-</div><div class='del'>-	if (str_uri[len - 5] == '.' &amp;&amp; str_uri[len - 4] == 'i' &amp;&amp;</div><div class='del'>-	    str_uri[len - 3] == 'c' &amp;&amp; str_uri[len - 2] == 'a' &amp;&amp;</div><div class='del'>-	    str_uri[len - 1] == 'l')</div><div class='del'>-		return CAL_FORMAT_ICALENDAR;</div><div class='del'>-</div><div class='del'>-	return CAL_FORMAT_VCALENDAR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Load handler for the IMC backend */</div><div class='del'>-static CalBackendLoadStatus</div><div class='del'>-cal_backend_imc_load (CalBackend *backend, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	VObject *vobject;</div><div class='del'>-	char *str_uri;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (!priv-&gt;loaded, CAL_BACKEND_LOAD_ERROR);</div><div class='del'>-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_LOAD_ERROR);</div><div class='del'>-</div><div class='del'>-	/* FIXME: this looks rather bad; maybe we should check for local files</div><div class='del'>-	 * and fail if they are remote.</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'>-	/* look at the extension on the filename and decide if this is a</div><div class='del'>-	 * iCalendar or vCalendar file.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;format = cal_get_type_from_filename (str_uri);</div><div class='del'>-</div><div class='del'>-	/* load */</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;format) {</div><div class='del'>-	case CAL_FORMAT_VCALENDAR:</div><div class='del'>-	        vobject = Parse_MIME_FromFileName (str_uri);</div><div class='del'>-</div><div class='del'>-		if (!vobject){</div><div class='del'>-			g_free (str_uri);</div><div class='del'>-			return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		load_from_vobject (cbimc, vobject);</div><div class='del'>-		cleanVObject (vobject);</div><div class='del'>-		cleanStrTbl ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_FORMAT_ICALENDAR:</div><div class='del'>-		icalendar_calendar_load (cbimc, str_uri);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_free (str_uri);</div><div class='del'>-	        return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_ref (uri);</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri = uri;</div><div class='del'>-	priv-&gt;loaded = TRUE;</div><div class='del'>-</div><div class='del'>-	return CAL_BACKEND_LOAD_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Create handler for the IMC backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_imc_create (CalBackend *backend, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	char *str_uri;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (!priv-&gt;loaded);</div><div class='del'>-	g_return_if_fail (uri != NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the new calendar information */</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;object_hash == NULL);</div><div class='del'>-	priv-&gt;object_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Done */</div><div class='del'>-</div><div class='del'>-	/* FIXME: this looks rather bad; maybe we should check for local files</div><div class='del'>-	 * and fail if they are remote.</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'>-	/* look at the extension on the filename and decide if this is a</div><div class='del'>-	 * iCalendar or vCalendar file.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;format = cal_get_type_from_filename (str_uri);</div><div class='del'>-</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_ref (uri);</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri = uri;</div><div class='del'>-	priv-&gt;loaded = TRUE;</div><div class='del'>-</div><div class='del'>-	save (cbimc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct get_n_objects_closure {</div><div class='del'>-	CalObjType type;</div><div class='del'>-	int n;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Counts the number of objects of the specified type.  Called from</div><div class='del'>- * g_hash_table_foreach().</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-count_objects (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	struct get_n_objects_closure *c;</div><div class='del'>-	gboolean store;</div><div class='del'>-</div><div class='del'>-	ico = value;</div><div class='del'>-	c = data;</div><div class='del'>-</div><div class='del'>-	store = FALSE;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;type == ICAL_EVENT)</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_EVENT) != 0;</div><div class='del'>-	else if (ico-&gt;type == ICAL_TODO)</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_TODO) != 0;</div><div class='del'>-	else if (ico-&gt;type == ICAL_JOURNAL)</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_JOURNAL) != 0;</div><div class='del'>-	else</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_OTHER) != 0;</div><div class='del'>-</div><div class='del'>-	if (store)</div><div class='del'>-		c-&gt;n++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_n_objects handler for the IMC backend */</div><div class='del'>-static int</div><div class='del'>-cal_backend_imc_get_n_objects (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	struct get_n_objects_closure c;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;loaded, -1);</div><div class='del'>-</div><div class='del'>-	c.type = type;</div><div class='del'>-	c.n = 0;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;object_hash, count_objects, &amp;c);</div><div class='del'>-</div><div class='del'>-	return c.n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_object handler for the IMC backend */</div><div class='del'>-static char *</div><div class='del'>-cal_backend_imc_get_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	char *buf;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&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;loaded, NULL);</div><div class='del'>-	g_assert (priv-&gt;object_hash != NULL);</div><div class='del'>-</div><div class='del'>-	ico = lookup_object (cbimc, uid);</div><div class='del'>-</div><div class='del'>-	if (!ico)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	buf = ical_object_to_string (ico);</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct get_uids_closure {</div><div class='del'>-	CalObjType type;</div><div class='del'>-	GList *uid_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Builds a list of UIDs for objects that match the sought type.  Called from</div><div class='del'>- * g_hash_table_foreach().</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-build_uids_list (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-	struct get_uids_closure *c;</div><div class='del'>-	gboolean store;</div><div class='del'>-</div><div class='del'>-	ico = value;</div><div class='del'>-	c = data;</div><div class='del'>-</div><div class='del'>-	store = FALSE;</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;type == ICAL_EVENT)</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_EVENT) ? TRUE : FALSE;</div><div class='del'>-	else if (ico-&gt;type == ICAL_TODO)</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_TODO) ? TRUE : FALSE;</div><div class='del'>-	else if (ico-&gt;type == ICAL_JOURNAL)</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_JOURNAL) ? TRUE : FALSE;</div><div class='del'>-	else</div><div class='del'>-		store = (c-&gt;type &amp; CALOBJ_TYPE_OTHER) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	if (store)</div><div class='del'>-		c-&gt;uid_list = g_list_prepend (c-&gt;uid_list, g_strdup (ico-&gt;uid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_uids handler for the IMC backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_imc_get_uids (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	struct get_uids_closure c;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;loaded, NULL);</div><div class='del'>-</div><div class='del'>-	/* We go through the hash table instead of the lists of particular</div><div class='del'>-	 * object types so that we can pick up CALOBJ_TYPE_OTHER objects.</div><div class='del'>-	 */</div><div class='del'>-	c.type = type;</div><div class='del'>-	c.uid_list = NULL;</div><div class='del'>-	g_hash_table_foreach (priv-&gt;object_hash, build_uids_list, &amp;c);</div><div class='del'>-</div><div class='del'>-	return c.uid_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Allocates and fills in a new CalObjInstance structure */</div><div class='del'>-static CalObjInstance *</div><div class='del'>-build_cal_obj_instance (iCalObject *ico, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalObjInstance *icoi;</div><div class='del'>-</div><div class='del'>-	g_assert (ico-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	icoi = g_new (CalObjInstance, 1);</div><div class='del'>-	icoi-&gt;uid = g_strdup (ico-&gt;uid);</div><div class='del'>-	icoi-&gt;start = start;</div><div class='del'>-	icoi-&gt;end = end;</div><div class='del'>-</div><div class='del'>-	return icoi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct build_event_list_closure {</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	GList *event_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Builds a sorted list of event object instances.  Used as a callback from</div><div class='del'>- * ical_object_generate_events().</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-build_event_list (iCalObject *ico, time_t start, time_t end, void *data)</div><div class='del'>-{</div><div class='del'>-	CalObjInstance *icoi;</div><div class='del'>-	struct build_event_list_closure *c;</div><div class='del'>-</div><div class='del'>-	c = data;</div><div class='del'>-</div><div class='del'>-	icoi = build_cal_obj_instance (ico, start, end);</div><div class='del'>-	c-&gt;event_list = g_list_prepend (c-&gt;event_list, icoi);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compares two CalObjInstance structures by their start times.  Called from</div><div class='del'>- * g_list_sort().</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-compare_instance_func (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const CalObjInstance *ca, *cb;</div><div class='del'>-	time_t diff;</div><div class='del'>-</div><div class='del'>-	ca = a;</div><div class='del'>-	cb = b;</div><div class='del'>-</div><div class='del'>-	diff = ca-&gt;start - cb-&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'>-/* Get_events_in_range handler for the IMC backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_imc_get_events_in_range (CalBackend *backend, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	struct build_event_list_closure c;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;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'>-	c.cbimc = cbimc;</div><div class='del'>-	c.event_list = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;events; l; l = l-&gt;next) {</div><div class='del'>-		iCalObject *ico;</div><div class='del'>-</div><div class='del'>-		ico = l-&gt;data;</div><div class='del'>-		ical_object_generate_events (ico, start, end,</div><div class='del'>-					     build_event_list, &amp;c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c.event_list = g_list_sort (c.event_list, compare_instance_func);</div><div class='del'>-	return c.event_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct build_alarm_list_closure {</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-	GList *alarms;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Computes the offset in minutes from an alarm trigger to the actual event */</div><div class='del'>-static int</div><div class='del'>-compute_alarm_offset (CalendarAlarm *a)</div><div class='del'>-{</div><div class='del'>-	int ofs;</div><div class='del'>-</div><div class='del'>-	if (!a-&gt;enabled)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	switch (a-&gt;units) {</div><div class='del'>-	case ALARM_MINUTES:</div><div class='del'>-		ofs = a-&gt;count * 60;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_HOURS:</div><div class='del'>-		ofs = a-&gt;count * 3600;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_DAYS:</div><div class='del'>-		ofs = a-&gt;count * 24 * 3600;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ofs = -1;</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ofs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Allocates and fills in a new CalAlarmInstance structure */</div><div class='del'>-static CalAlarmInstance *</div><div class='del'>-build_cal_alarm_instance (iCalObject *ico, enum AlarmType type, time_t trigger, time_t occur)</div><div class='del'>-{</div><div class='del'>-	CalAlarmInstance *ai;</div><div class='del'>-</div><div class='del'>-	g_assert (ico-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	ai = g_new (CalAlarmInstance, 1);</div><div class='del'>-	ai-&gt;uid = g_strdup (ico-&gt;uid);</div><div class='del'>-	ai-&gt;type = type;</div><div class='del'>-	ai-&gt;trigger = trigger;</div><div class='del'>-	ai-&gt;occur = occur;</div><div class='del'>-</div><div class='del'>-	return ai;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds the specified alarm to the list if its trigger time falls within the</div><div class='del'>- * requested range.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-try_add_alarm (time_t occur_start, iCalObject *ico, CalendarAlarm *alarm,</div><div class='del'>-	       struct build_alarm_list_closure *c)</div><div class='del'>-{</div><div class='del'>-	int ofs;</div><div class='del'>-	time_t trigger;</div><div class='del'>-	CalAlarmInstance *ai;</div><div class='del'>-</div><div class='del'>-	if (!alarm-&gt;enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ofs = compute_alarm_offset (alarm);</div><div class='del'>-	g_assert (ofs != -1);</div><div class='del'>-</div><div class='del'>-	trigger = occur_start - ofs;</div><div class='del'>-</div><div class='del'>-	if (trigger &lt; c-&gt;start || trigger &gt; c-&gt;end)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ai = build_cal_alarm_instance (ico, alarm-&gt;type, trigger, occur_start);</div><div class='del'>-	c-&gt;alarms = g_list_prepend (c-&gt;alarms, ai);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of alarm instances.  Used as a callback from</div><div class='del'>- * ical_object_generate_events().</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-build_alarm_list (iCalObject *ico, time_t start, time_t end, void *data)</div><div class='del'>-{</div><div class='del'>-	struct build_alarm_list_closure *c;</div><div class='del'>-</div><div class='del'>-	c = data;</div><div class='del'>-</div><div class='del'>-	try_add_alarm (start, ico, &amp;ico-&gt;dalarm, c);</div><div class='del'>-	try_add_alarm (start, ico, &amp;ico-&gt;aalarm, c);</div><div class='del'>-	try_add_alarm (start, ico, &amp;ico-&gt;palarm, c);</div><div class='del'>-	try_add_alarm (start, ico, &amp;ico-&gt;malarm, c);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds all the alarm triggers that occur within the specified time range */</div><div class='del'>-static GList *</div><div class='del'>-add_alarms_for_object (GList *alarms, iCalObject *ico, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	struct build_alarm_list_closure c;</div><div class='del'>-	int dofs, aofs, pofs, mofs;</div><div class='del'>-	int max_ofs;</div><div class='del'>-</div><div class='del'>-	dofs = compute_alarm_offset (&amp;ico-&gt;dalarm);</div><div class='del'>-	aofs = compute_alarm_offset (&amp;ico-&gt;aalarm);</div><div class='del'>-	pofs = compute_alarm_offset (&amp;ico-&gt;palarm);</div><div class='del'>-	mofs = compute_alarm_offset (&amp;ico-&gt;malarm);</div><div class='del'>-</div><div class='del'>-	max_ofs = MAX (dofs, MAX (aofs, MAX (pofs, mofs)));</div><div class='del'>-	if (max_ofs == -1)</div><div class='del'>-		return alarms;</div><div class='del'>-</div><div class='del'>-	c.start = start;</div><div class='del'>-	c.end = end;</div><div class='del'>-	c.alarms = alarms;</div><div class='del'>-</div><div class='del'>-	ical_object_generate_events (ico, start, end, build_alarm_list, &amp;c);</div><div class='del'>-	return c.alarms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_alarms_in_range handler for the IMC backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_imc_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-	GList *alarms;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;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'>-	/* Only VEVENT and VTODO components can have alarms */</div><div class='del'>-</div><div class='del'>-	alarms = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;events; l; l = l-&gt;next)</div><div class='del'>-		alarms = add_alarms_for_object (alarms, (iCalObject *) l-&gt;data, start, end);</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;todos; l; l = l-&gt;next)</div><div class='del'>-		alarms = add_alarms_for_object (alarms, (iCalObject *) l-&gt;data, start, end);</div><div class='del'>-</div><div class='del'>-	alarms = g_list_sort (alarms, compare_instance_func);</div><div class='del'>-	return alarms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_alarms_for_object handler for the IMC backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_imc_get_alarms_for_object (CalBackend *backend, const char *uid,</div><div class='del'>-				       time_t start, time_t end,</div><div class='del'>-				       GList **alarms)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;loaded, FALSE);</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'>-</div><div class='del'>-	ico = lookup_object (cbimc, uid);</div><div class='del'>-	if (!ico)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Only VEVENT and VTODO components can have alarms */</div><div class='del'>-</div><div class='del'>-	if (ico-&gt;type != ICAL_EVENT &amp;&amp; ico-&gt;type != ICAL_TODO)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	*alarms = add_alarms_for_object (*alarms, ico, start, end);</div><div class='del'>-	*alarms = g_list_sort (*alarms, compare_instance_func);</div><div class='del'>-</div><div class='del'>-	return TRUE;</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 (CalBackendIMC *cbimc, const char *uid)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&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 (CalBackendIMC *cbimc, const char *uid)</div><div class='del'>-{</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&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'>-/* Update_object handler for the IMC backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_imc_update_object (CalBackend *backend, const char *uid, const char *calobj)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	iCalObject *ico, *new_ico;</div><div class='del'>-	CalObjFindStatus status;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;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 (calobj != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Pull the object from the string */</div><div class='del'>-</div><div class='del'>-	status = ical_object_find_in_string (uid, calobj, &amp;new_ico);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_OBJ_FIND_SUCCESS)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Update the object */</div><div class='del'>-</div><div class='del'>-	ico = lookup_object (cbimc, uid);</div><div class='del'>-</div><div class='del'>-	if (ico)</div><div class='del'>-		remove_object (cbimc, ico);</div><div class='del'>-</div><div class='del'>-	add_object (cbimc, new_ico);</div><div class='del'>-	save (cbimc);</div><div class='del'>-</div><div class='del'>-	/* FIXME: do the notification asynchronously */</div><div class='del'>-</div><div class='del'>-	notify_update (cbimc, new_ico-&gt;uid);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Remove_object handler for the IMC backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_imc_remove_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendIMC *cbimc;</div><div class='del'>-	IMCPrivate *priv;</div><div class='del'>-	iCalObject *ico;</div><div class='del'>-</div><div class='del'>-	cbimc = CAL_BACKEND_IMC (backend);</div><div class='del'>-	priv = cbimc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;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'>-	ico = lookup_object (cbimc, uid);</div><div class='del'>-	if (!ico)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	remove_object (cbimc, ico);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dirty = TRUE;</div><div class='del'>-	save (cbimc);</div><div class='del'>-</div><div class='del'>-	/* FIXME: do the notification asynchronously */</div><div class='del'>-	notify_remove (cbimc, uid);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/cal-backend-imc.h b/calendar/pcs/cal-backend-imc.h<br/>deleted file mode 100644<br/>index 954bbc52cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-imc.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal-backend-imc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Internet Mail Consortium formats backend</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@helixcode.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@helixcode.com&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'>-#ifndef CAL_BACKEND_IMC_H</div><div class='del'>-#define CAL_BACKEND_IMC_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_IMC_TYPE            (cal_backend_imc_get_type ())</div><div class='del'>-#define CAL_BACKEND_IMC(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_IMC_TYPE, CalBackendIMC))</div><div class='del'>-#define CAL_BACKEND_IMC_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_IMC_TYPE,	\</div><div class='del'>-					 CalBackendIMCClass))</div><div class='del'>-#define IS_CAL_BACKEND_IMC(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_IMC_TYPE))</div><div class='del'>-#define IS_CAL_BACKEND_IMC_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_IMC_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalBackendIMC CalBackendIMC;</div><div class='del'>-typedef struct _CalBackendIMCClass CalBackendIMCClass;</div><div class='del'>-</div><div class='del'>-struct _CalBackendIMC {</div><div class='del'>-	CalBackend backend;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalBackendIMCClass {</div><div class='del'>-	CalBackendClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType cal_backend_imc_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.c b/calendar/pcs/cal-backend.c<br/>deleted file mode 100644<br/>index 7956f77473..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal-backend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,377 +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 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;cal-util/calobj.h&gt;</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'>-	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 GtkObjectClass *parent_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'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</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'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, cal_backend_signals, LAST_SIGNAL);</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 a loaded</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'>-GnomeVFSURI *</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'>-/**</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 a loaded 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'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;add_cal != NULL);</div><div class='del'>-	(* CLASS (backend)-&gt;add_cal) (backend, cal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_load:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uri: URI that contains the calendar data.</div><div class='del'>- *</div><div class='del'>- * Loads 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'>-CalBackendLoadStatus</div><div class='del'>-cal_backend_load (CalBackend *backend, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, CAL_BACKEND_LOAD_ERROR);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_BACKEND_LOAD_ERROR);</div><div class='del'>-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_LOAD_ERROR);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;load != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;load) (backend, uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_create:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uri: URI that will contain the calendar data.</div><div class='del'>- *</div><div class='del'>- * Creates a new empty calendar in a calendar backend.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_create (CalBackend *backend, GnomeVFSURI *uri)</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 (uri != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;create != NULL);</div><div class='del'>-	(* CLASS (backend)-&gt;create) (backend, uri);</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.  A complete</div><div class='del'>- * calendar is returned because you also need the timezone data.</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_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.</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'>- * cal_backend_get_events_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'>- *</div><div class='del'>- * Builds a sorted list of calendar event object instances that occur or recur</div><div class='del'>- * within the specified time range.  Each object instance contains the object</div><div class='del'>- * itself and the start/end times at which it occurs or recurs.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of calendar event object instances, sorted by their</div><div class='del'>- * start times.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_events_in_range (CalBackend *backend, 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_events_in_range != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_events_in_range) (backend, start, end);</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'>- * </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 list of #CalAlarmInstance structures, sorted by trigger time.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_alarms_in_range (CalBackend *backend, 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_alarms_in_range != NULL);</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'>- * 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'>- * @alarms: Return value for the list of alarm instances.</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: TRUE on success, FALSE if the object was not found.</div><div class='del'>- **/</div><div class='del'>-gboolean</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'>-				   GList **alarms)</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'>-	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'>-	g_assert (CLASS (backend)-&gt;get_alarms_for_object != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_alarms_for_object) (backend, uid, start, end, alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_update_object:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier of the object to update.</div><div class='del'>- * @calobj: String representation of the new calendar object.</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.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_update_object (CalBackend *backend, const char *uid, 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 (uid != NULL, 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_object != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;update_object) (backend, uid, 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='head'>diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h<br/>deleted file mode 100644<br/>index 57f3acf18e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal-backend.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +0,0 @@</div><div class='del'>-/* Evolution calendar - generic backend class</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-util.h&gt;</div><div class='del'>-#include "calendar/pcs/evolution-calendar.h"</div><div class='del'>-#include "cal-common.h"</div><div class='del'>-#include "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 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'>-/* Load status values */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_BACKEND_LOAD_SUCCESS,	/* Loading OK */</div><div class='del'>-	CAL_BACKEND_LOAD_ERROR		/* We need better error reporting in libversit */</div><div class='del'>-} CalBackendLoadStatus;</div><div class='del'>-</div><div class='del'>-struct _CalBackend {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</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'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	GnomeVFSURI *(* get_uri) (CalBackend *backend);</div><div class='del'>-	void (* add_cal) (CalBackend *backend, Cal *cal);</div><div class='del'>-	CalBackendLoadStatus (* load) (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-	void (* create) (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-</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'>-	GList *(* get_uids) (CalBackend *backend, CalObjType type);</div><div class='del'>-	GList *(* get_events_in_range) (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-	GList *(* get_alarms_in_range) (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-	gboolean (* get_alarms_for_object) (CalBackend *backend, const char *uid,</div><div class='del'>-					    time_t start, time_t end,</div><div class='del'>-					    GList **alarms);</div><div class='del'>-	gboolean (* update_object) (CalBackend *backend, const char *uid, const char *calobj);</div><div class='del'>-	gboolean (* remove_object) (CalBackend *backend, const char *uid);</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'>-GnomeVFSURI *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'>-CalBackendLoadStatus cal_backend_load (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-</div><div class='del'>-void cal_backend_create (CalBackend *backend, GnomeVFSURI *uri);</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'>-GList *cal_backend_get_uids (CalBackend *backend, CalObjType type);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_events_in_range (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-gboolean 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'>-					    GList **alarms);</div><div class='del'>-</div><div class='del'>-gboolean cal_backend_update_object (CalBackend *backend, const char *uid, 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'>-void cal_backend_last_client_gone (CalBackend *backend);</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 e51ddf1bdd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-common.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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 9e60815805..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-factory.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,829 +0,0 @@</div><div class='del'>-/* Evolution calendar factory</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</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'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalFactory structure */</div><div class='del'>-typedef struct {</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'>-} CalFactoryPrivate;</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_CALENDAR_GONE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cal_factory_class_init (CalFactoryClass *class);</div><div class='del'>-static void cal_factory_init (CalFactory *factory);</div><div class='del'>-static void cal_factory_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Calendar_CalFactory__vepv cal_factory_vepv;</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static guint cal_factory_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalFactory 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 #CalFactory class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_factory_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_factory_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_factory_type) {</div><div class='del'>-		static const GtkTypeInfo cal_factory_info = {</div><div class='del'>-			"CalFactory",</div><div class='del'>-			sizeof (CalFactory),</div><div class='del'>-			sizeof (CalFactoryClass),</div><div class='del'>-			(GtkClassInitFunc) cal_factory_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_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'>-		cal_factory_type = gtk_type_unique (bonobo_object_get_type (), &amp;cal_factory_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_factory_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CORBA class initialization function for the calendar factory */</div><div class='del'>-static void</div><div class='del'>-init_cal_factory_corba_class (void)</div><div class='del'>-{</div><div class='del'>-	cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	cal_factory_vepv.Evolution_Calendar_CalFactory_epv = cal_factory_get_epv ();</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 *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_object_get_type ());</div><div class='del'>-</div><div class='del'>-	cal_factory_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, cal_factory_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_factory_destroy;</div><div class='del'>-</div><div class='del'>-	init_cal_factory_corba_class ();</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 (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);</div><div class='del'>-}</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'>-	GnomeVFSURI *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'>-	gnome_vfs_uri_unref (uri);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (backend));</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'>-	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'>-/* Loading and creating calendars */</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'>-	Evolution_Calendar_Listener listener;</div><div class='del'>-} LoadCreateJobData;</div><div class='del'>-</div><div class='del'>-/* Queues a load or create request */</div><div class='del'>-static void</div><div class='del'>-queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener,</div><div class='del'>-		       JobFunc func)</div><div class='del'>-{</div><div class='del'>-	LoadCreateJobData *jd;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_Listener listener_copy;</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	if ((!uri) || (!*uri))</div><div class='del'>-	  return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	result = CORBA_Object_is_nil (listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("queue_load_create_job(): could not see if the listener was 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'>-		g_message ("queue_load_create_job(): cannot operate on a NIL listener!");</div><div class='del'>-		return;</div><div class='del'>-	}</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_message ("queue_load_create_job(): could not duplicate the listener");</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'>-	jd = g_new (LoadCreateJobData, 1);</div><div class='del'>-	jd-&gt;factory = factory;</div><div class='del'>-	jd-&gt;uri = g_strdup (uri);</div><div class='del'>-	jd-&gt;listener = listener_copy;</div><div class='del'>-</div><div class='del'>-	job_add (func, jd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Looks up a calendar backend in a factory's hash table of uri-&gt;cal */</div><div class='del'>-static CalBackend *</div><div class='del'>-lookup_backend (CalFactory *factory, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	backend = g_hash_table_lookup (priv-&gt;backends, uri);</div><div class='del'>-	return backend;</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'>-	GnomeVFSURI *uri;</div><div class='del'>-	gpointer orig_key;</div><div class='del'>-	gboolean result;</div><div class='del'>-	GnomeVFSURI *orig_uri;</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'>-	uri = cal_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 (priv-&gt;backends, uri, &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 (priv-&gt;backends, orig_uri);</div><div class='del'>-	gnome_vfs_uri_unref (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 (priv-&gt;backends) == 0)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (factory), cal_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, GnomeVFSURI *uri, CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_ref (uri);</div><div class='del'>-	g_hash_table_insert (priv-&gt;backends, uri, backend);</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, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	char *method;</div><div class='del'>-	GtkType *type;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* FIXME: add an accessor function to gnome-vfs */</div><div class='del'>-	method = uri-&gt;method_string;</div><div class='del'>-</div><div class='del'>-	type = g_hash_table_lookup (priv-&gt;methods, method);</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'>-		Evolution_Calendar_Listener_cal_loaded (</div><div class='del'>-			listener,</div><div class='del'>-			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'>-/* Loads a calendar backend and puts it in the factory's backend hash table */</div><div class='del'>-static CalBackend *</div><div class='del'>-load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	CalBackendLoadStatus 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, uri, listener);</div><div class='del'>-	if (!backend)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	status = cal_backend_load (backend, uri);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_BACKEND_LOAD_SUCCESS:</div><div class='del'>-		add_backend (factory, uri, backend);</div><div class='del'>-		return backend;</div><div class='del'>-</div><div class='del'>-	case CAL_BACKEND_LOAD_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'>-		Evolution_Calendar_Listener_cal_loaded (listener,</div><div class='del'>-							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 ("load_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'>-/* Creates a calendar backend and puts it in the factory's backend hash table */</div><div class='del'>-static CalBackend *</div><div class='del'>-create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CalBackend *backend;</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, uri, listener);</div><div class='del'>-	if (!backend)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	cal_backend_create (backend, uri);</div><div class='del'>-</div><div class='del'>-	/* FIXME: add error reporting to cal_backend_create() */</div><div class='del'>-#if 0</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'>-		Evolution_Calendar_Listener_cal_loaded (listener,</div><div class='del'>-							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 ("create_fn(): could not notify the listener");</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'>-	add_backend (factory, uri, backend);</div><div class='del'>-</div><div class='del'>-	return backend;</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, CalBackend *backend, 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'>-		Evolution_Calendar_Listener_cal_loaded (listener,</div><div class='del'>-							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'>-	Evolution_Calendar_Listener_cal_loaded (listener,</div><div class='del'>-						Evolution_Calendar_Listener_SUCCESS,</div><div class='del'>-						bonobo_object_corba_objref (BONOBO_OBJECT (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'>-/* Job handler for the load calendar command */</div><div class='del'>-static void</div><div class='del'>-load_fn (gpointer data)</div><div class='del'>-{</div><div class='del'>-	LoadCreateJobData *jd;</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-	Evolution_Calendar_Listener listener;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	jd = data;</div><div class='del'>-</div><div class='del'>-	/* Look up the calendar */</div><div class='del'>-</div><div class='del'>-	uri = gnome_vfs_uri_new (jd-&gt;uri);</div><div class='del'>-	g_free (jd-&gt;uri);</div><div class='del'>-</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'>-	/* Look up the backend and create it if needed */</div><div class='del'>-</div><div class='del'>-	backend = lookup_backend (factory, uri);</div><div class='del'>-</div><div class='del'>-	if (!backend)</div><div class='del'>-		backend = load_backend (factory, uri, listener);</div><div class='del'>-</div><div class='del'>-	if (!backend)</div><div class='del'>-		goto out;</div><div class='del'>-</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'>-	gnome_vfs_uri_unref (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 ("load_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'>-/* Job handler for the create calendar command */</div><div class='del'>-static void</div><div class='del'>-create_fn (gpointer data)</div><div class='del'>-{</div><div class='del'>-	LoadCreateJobData *jd;</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-	Evolution_Calendar_Listener listener;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	jd = data;</div><div class='del'>-	factory = jd-&gt;factory;</div><div class='del'>-</div><div class='del'>-	uri = gnome_vfs_uri_new (jd-&gt;uri);</div><div class='del'>-	g_free (jd-&gt;uri);</div><div class='del'>-</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'>-	/* Check that the backend is not in use */</div><div class='del'>-</div><div class='del'>-	backend = lookup_backend (factory, uri);</div><div class='del'>-</div><div class='del'>-	if (backend) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		Evolution_Calendar_Listener_cal_loaded (listener,</div><div class='del'>-							Evolution_Calendar_Listener_IN_USE,</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 ("create_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'>-	/* Create the backend */</div><div class='del'>-</div><div class='del'>-	backend = create_backend (factory, uri, listener);</div><div class='del'>-</div><div class='del'>-	if (!backend)</div><div class='del'>-		goto out;</div><div class='del'>-</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'>-	gnome_vfs_uri_unref (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 ("create_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'>-/* CORBA servant implementation */</div><div class='del'>-</div><div class='del'>-/* CalFactory::load method */</div><div class='del'>-static void</div><div class='del'>-CalFactory_load (PortableServer_Servant servant,</div><div class='del'>-		 const CORBA_char *uri,</div><div class='del'>-		 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'>-</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'>-	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_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'>-	queue_load_create_job (factory, uri, listener, load_fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CalFactory::create method */</div><div class='del'>-static void</div><div class='del'>-CalFactory_create (PortableServer_Servant servant,</div><div class='del'>-		   const CORBA_char *uri,</div><div class='del'>-		   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'>-</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'>-	queue_load_create_job (factory, uri, listener, create_fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_get_epv:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Creates an EPV for the CalFactory CORBA class.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-allocated EPV.</div><div class='del'>- **/</div><div class='del'>-POA_Evolution_Calendar_CalFactory__epv *</div><div class='del'>-cal_factory_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Calendar_CalFactory__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Calendar_CalFactory__epv, 1);</div><div class='del'>-	epv-&gt;load = CalFactory_load;</div><div class='del'>-	epv-&gt;create = CalFactory_create;</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'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_construct:</div><div class='del'>- * @factory: A calendar factory.</div><div class='del'>- * @corba_factory: CORBA object for the calendar factory.</div><div class='del'>- *</div><div class='del'>- * Constructs a calendar factory by binding the corresponding CORBA object to</div><div class='del'>- * it.</div><div class='del'>- *</div><div class='del'>- * Return value: The same object as the @factory argument.</div><div class='del'>- **/</div><div class='del'>-CalFactory *</div><div class='del'>-cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (factory != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (factory), corba_factory);</div><div class='del'>-	return factory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_corba_object_create:</div><div class='del'>- * @object: #BonoboObject that will wrap the CORBA object.</div><div class='del'>- *</div><div class='del'>- * Creates and activates the CORBA object that is wrapped by the specified</div><div class='del'>- * calendar factory @object.</div><div class='del'>- *</div><div class='del'>- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of</div><div class='del'>- * failure.</div><div class='del'>- **/</div><div class='del'>-Evolution_Calendar_CalFactory</div><div class='del'>-cal_factory_corba_object_create (BonoboObject *object)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Calendar_CalFactory *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;cal_factory_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_factory_corba_object_create(): could not init the servant");</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'>-	return (Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);</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'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_CalFactory corba_factory;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	factory = gtk_type_new (CAL_FACTORY_TYPE);</div><div class='del'>-</div><div class='del'>-	corba_factory = cal_factory_corba_object_create (BONOBO_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	retval = CORBA_Object_is_nil (corba_factory, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION || retval) {</div><div class='del'>-		g_message ("cal_factory_new(): could not create the CORBA factory");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (factory));</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'>-	return cal_factory_construct (factory, corba_factory);</div><div class='del'>-}</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'>-	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_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 load 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='head'>diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h<br/>deleted file mode 100644<br/>index f96ba4ba92..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-factory.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/* Evolution calendar factory</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include "calendar/pcs/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'>-struct _CalFactory {</div><div class='del'>-	BonoboObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalFactoryClass {</div><div class='del'>-	BonoboObjectClass parent_class;</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'>-</div><div class='del'>-CalFactory *cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory);</div><div class='del'>-Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);</div><div class='del'>-</div><div class='del'>-CalFactory *cal_factory_new (void);</div><div class='del'>-</div><div class='del'>-void cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type);</div><div class='del'>-</div><div class='del'>-int cal_factory_get_n_backends (CalFactory *factory);</div><div class='del'>-</div><div class='del'>-POA_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (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.c b/calendar/pcs/cal.c<br/>deleted file mode 100644<br/>index a01c0ce8dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,736 +0,0 @@</div><div class='del'>-/* Evolution calendar client interface object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "cal.h"</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the Cal structure */</div><div class='del'>-typedef struct {</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'>-	Evolution_Calendar_Listener listener;</div><div class='del'>-} CalPrivate;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_class_init (CalClass *class);</div><div class='del'>-static void cal_init (Cal *cal);</div><div class='del'>-static void cal_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Calendar_Cal__vepv cal_vepv;</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #Cal class if necessary, and returns the type ID associated to</div><div class='del'>- * it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #Cal class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_type) {</div><div class='del'>-		static const GtkTypeInfo cal_info = {</div><div class='del'>-			"Cal",</div><div class='del'>-			sizeof (Cal),</div><div class='del'>-			sizeof (CalClass),</div><div class='del'>-			(GtkClassInitFunc) cal_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_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_type = gtk_type_unique (BONOBO_OBJECT_TYPE, &amp;cal_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CORBA class initialzation function for the calendar */</div><div class='del'>-static void</div><div class='del'>-init_cal_corba_class (void)</div><div class='del'>-{</div><div class='del'>-	cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	cal_vepv.Evolution_Calendar_Cal_epv = cal_get_epv ();</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 *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_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_destroy;</div><div class='del'>-</div><div class='del'>-	init_cal_corba_class ();</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'>-/* 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'>-	CORBA_Object_release (priv-&gt;listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("cal_destroy(): 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 (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'>-/* CORBA servant implementation */</div><div class='del'>-</div><div class='del'>-/* Cal::get_uri method */</div><div class='del'>-static CORBA_char *</div><div class='del'>-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'>-	GnomeVFSURI *uri;</div><div class='del'>-	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'>-	uri = cal_backend_get_uri (priv-&gt;backend);</div><div class='del'>-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-	str_uri_copy = CORBA_string_dup (str_uri);</div><div class='del'>-	g_free (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'>-/* Cal::get_n_objects method */</div><div class='del'>-static CORBA_long</div><div class='del'>-Cal_get_n_objects (PortableServer_Servant servant,</div><div class='del'>-		   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'>-	/* Translate the CORBA flags to our own flags */</div><div class='del'>-</div><div class='del'>-	t = (((type &amp; Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0)</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_OTHER) ? CALOBJ_TYPE_OTHER : 0)</div><div class='del'>-	     /*</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_ANY) ? CALOBJ_TYPE_ANY : 0)</div><div class='del'>-	     */</div><div class='del'>-	     );</div><div class='del'>-</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 Evolution_Calendar_CalObj</div><div class='del'>-Cal_get_object (PortableServer_Servant servant,</div><div class='del'>-		const 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'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_NotFound,</div><div class='del'>-				     NULL);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_uids method */</div><div class='del'>-static Evolution_Calendar_CalObjUIDSeq *</div><div class='del'>-Cal_get_uids (PortableServer_Servant servant,</div><div class='del'>-	      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, *l;</div><div class='del'>-	Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-	int n, i;</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'>-	/* Translate the CORBA flags to our own flags */</div><div class='del'>-</div><div class='del'>-	t = (((type &amp; Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0)</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_OTHER) ? CALOBJ_TYPE_OTHER : 0)</div><div class='del'>-	     /*</div><div class='del'>-	     | ((type &amp; Evolution_Calendar_TYPE_ANY) ? CALOBJ_TYPE_ANY : 0)</div><div class='del'>-	     */</div><div class='del'>-	     );</div><div class='del'>-</div><div class='del'>-	uids = cal_backend_get_uids (priv-&gt;backend, t);</div><div class='del'>-	n = g_list_length (uids);</div><div class='del'>-</div><div class='del'>-	seq = 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_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'>-</div><div class='del'>-		seq-&gt;_buffer[i] = CORBA_string_dup (uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Done */</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'>-/* Builds a CORBA sequence of calendar object instances from a CalObjInstance</div><div class='del'>- * list.</div><div class='del'>- */</div><div class='del'>-static Evolution_Calendar_CalObjInstanceSeq *</div><div class='del'>-build_object_instance_seq (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int n, i;</div><div class='del'>-	Evolution_Calendar_CalObjInstanceSeq *seq;</div><div class='del'>-</div><div class='del'>-	n = g_list_length (list);</div><div class='del'>-</div><div class='del'>-	seq = Evolution_Calendar_CalObjInstanceSeq__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_Evolution_Calendar_CalObjInstance_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 = list; l; i++, l = l-&gt;next) {</div><div class='del'>-		CalObjInstance *icoi;</div><div class='del'>-		Evolution_Calendar_CalObjInstance *corba_icoi;</div><div class='del'>-</div><div class='del'>-		icoi = l-&gt;data;</div><div class='del'>-		corba_icoi = &amp;seq-&gt;_buffer[i];</div><div class='del'>-</div><div class='del'>-		corba_icoi-&gt;uid = CORBA_string_dup (icoi-&gt;uid);</div><div class='del'>-		corba_icoi-&gt;start = icoi-&gt;start;</div><div class='del'>-		corba_icoi-&gt;end = icoi-&gt;end;</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_events_in_range method */</div><div class='del'>-static Evolution_Calendar_CalObjInstanceSeq *</div><div class='del'>-Cal_get_events_in_range (PortableServer_Servant servant,</div><div class='del'>-			 Evolution_Calendar_Time_t start,</div><div class='del'>-			 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'>-	Evolution_Calendar_CalObjInstanceSeq *seq;</div><div class='del'>-	GList *elist;</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'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_InvalidRange,</div><div class='del'>-				     NULL);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Figure out the list and allocate the sequence */</div><div class='del'>-</div><div class='del'>-	elist = cal_backend_get_events_in_range (priv-&gt;backend, t_start, t_end);</div><div class='del'>-	seq = build_object_instance_seq (elist);</div><div class='del'>-	cal_obj_instance_list_free (elist);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Translates an enum AlarmType to its CORBA representation */</div><div class='del'>-static Evolution_Calendar_AlarmType</div><div class='del'>-corba_alarm_type (enum AlarmType type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ALARM_MAIL:</div><div class='del'>-		return Evolution_Calendar_MAIL;</div><div class='del'>-</div><div class='del'>-	case ALARM_PROGRAM:</div><div class='del'>-		return Evolution_Calendar_PROGRAM;</div><div class='del'>-</div><div class='del'>-	case ALARM_DISPLAY:</div><div class='del'>-		return Evolution_Calendar_DISPLAY;</div><div class='del'>-</div><div class='del'>-	case ALARM_AUDIO:</div><div class='del'>-		return Evolution_Calendar_AUDIO;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return Evolution_Calendar_DISPLAY;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a CORBA sequence of alarm instances from a CalAlarmInstance list. */</div><div class='del'>-static Evolution_Calendar_CalAlarmInstanceSeq *</div><div class='del'>-build_alarm_instance_seq (GList *alarms)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int n, i;</div><div class='del'>-	Evolution_Calendar_CalAlarmInstanceSeq *seq;</div><div class='del'>-</div><div class='del'>-	n = g_list_length (alarms);</div><div class='del'>-</div><div class='del'>-	seq = Evolution_Calendar_CalAlarmInstanceSeq__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_Evolution_Calendar_CalAlarmInstance_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 = alarms; l; i++, l = l-&gt;next) {</div><div class='del'>-		CalAlarmInstance *ai;</div><div class='del'>-		Evolution_Calendar_CalAlarmInstance *corba_ai;</div><div class='del'>-</div><div class='del'>-		ai = l-&gt;data;</div><div class='del'>-		corba_ai = &amp;seq-&gt;_buffer[i];</div><div class='del'>-</div><div class='del'>-		corba_ai-&gt;uid = CORBA_string_dup (ai-&gt;uid);</div><div class='del'>-		corba_ai-&gt;type = corba_alarm_type (ai-&gt;type);</div><div class='del'>-		corba_ai-&gt;trigger = ai-&gt;trigger;</div><div class='del'>-		corba_ai-&gt;occur = ai-&gt;occur;</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_in_range method */</div><div class='del'>-static Evolution_Calendar_CalAlarmInstanceSeq *</div><div class='del'>-Cal_get_alarms_in_range (PortableServer_Servant servant,</div><div class='del'>-			 Evolution_Calendar_Time_t start,</div><div class='del'>-			 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'>-	Evolution_Calendar_CalAlarmInstanceSeq *seq;</div><div class='del'>-	GList *alarms;</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'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_InvalidRange,</div><div class='del'>-				     NULL);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Figure out the list and allocate the sequence */</div><div class='del'>-</div><div class='del'>-	alarms = cal_backend_get_alarms_in_range (priv-&gt;backend, t_start, t_end);</div><div class='del'>-	seq = build_alarm_instance_seq (alarms);</div><div class='del'>-	cal_alarm_instance_list_free (alarms);</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 Evolution_Calendar_CalAlarmInstanceSeq *</div><div class='del'>-Cal_get_alarms_for_object (PortableServer_Servant servant,</div><div class='del'>-			   const Evolution_Calendar_CalObjUID uid,</div><div class='del'>-			   Evolution_Calendar_Time_t start,</div><div class='del'>-			   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'>-	Evolution_Calendar_CalAlarmInstanceSeq *seq;</div><div class='del'>-	GList *alarms;</div><div class='del'>-	gboolean 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'>-	if (t_start &gt; t_end || t_start == -1 || t_end == -1) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_InvalidRange,</div><div class='del'>-				     NULL);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = cal_backend_get_alarms_for_object (priv-&gt;backend, uid, t_start, t_end, &amp;alarms);</div><div class='del'>-	if (!result) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_NotFound,</div><div class='del'>-				     NULL);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq = build_alarm_instance_seq (alarms);</div><div class='del'>-	cal_alarm_instance_list_free (alarms);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::update_object method */</div><div class='del'>-static void</div><div class='del'>-Cal_update_object (PortableServer_Servant servant,</div><div class='del'>-		   const Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		   const 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_object (priv-&gt;backend, uid, calobj))</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_InvalidObject,</div><div class='del'>-				     NULL);</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'>-Cal_remove_object (PortableServer_Servant servant,</div><div class='del'>-		   const 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'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Calendar_Cal_NotFound,</div><div class='del'>-				     NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_get_epv:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Creates an EPV for the Cal CORBA class.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-allocated EPV.</div><div class='del'>- **/</div><div class='del'>-POA_Evolution_Calendar_Cal__epv *</div><div class='del'>-cal_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Calendar_Cal__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1);</div><div class='del'>-	epv-&gt;_get_uri = Cal_get_uri;</div><div class='del'>-	epv-&gt;get_n_objects = Cal_get_n_objects;</div><div class='del'>-	epv-&gt;get_object = Cal_get_object;</div><div class='del'>-	epv-&gt;get_uids = Cal_get_uids;</div><div class='del'>-	epv-&gt;get_events_in_range = Cal_get_events_in_range;</div><div class='del'>-	epv-&gt;get_alarms_in_range = Cal_get_alarms_in_range;</div><div class='del'>-	epv-&gt;get_alarms_for_object = Cal_get_alarms_for_object;</div><div class='del'>-	epv-&gt;update_object = Cal_update_object;</div><div class='del'>-	epv-&gt;remove_object = Cal_remove_object;</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'>-</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'>-	       Evolution_Calendar_Cal corba_cal,</div><div class='del'>-	       CalBackend *backend,</div><div class='del'>-	       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 (ev._major != CORBA_NO_EXCEPTION) {</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'>-	priv-&gt;backend = backend;</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (cal), corba_cal);</div><div class='del'>-	return cal;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_corba_object_create:</div><div class='del'>- * @object: #BonoboObject that will wrap the CORBA object.</div><div class='del'>- *</div><div class='del'>- * Creates and activates the CORBA object that is wrapped by the specified</div><div class='del'>- * calendar client interface @object.</div><div class='del'>- *</div><div class='del'>- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of</div><div class='del'>- * failure.</div><div class='del'>- **/</div><div class='del'>-Evolution_Calendar_Cal</div><div class='del'>-cal_corba_object_create (BonoboObject *object)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Calendar_Cal *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;cal_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_corba_object_create(): could not init the servant");</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'>-	return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);</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, Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	Cal *cal, *retval;</div><div class='del'>-	Evolution_Calendar_Cal corba_cal;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean ret;</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'>-	corba_cal = cal_corba_object_create (BONOBO_OBJECT (cal));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	ret = CORBA_Object_is_nil ((CORBA_Object) corba_cal, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION || ret) {</div><div class='del'>-		g_message ("cal_new(): could not create the CORBA object");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (cal));</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'>-	retval = cal_construct (cal, corba_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'>-/**</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'>-	Evolution_Calendar_Listener_obj_updated (priv-&gt;listener, uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</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'>-	Evolution_Calendar_Listener_obj_removed (priv-&gt;listener, uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</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='head'>diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h<br/>deleted file mode 100644<br/>index a11cedebbb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>calendar/pcs/cal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* Evolution calendar client interface object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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-object.h&gt;</div><div class='del'>-#include "calendar/pcs/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'>-struct _Cal {</div><div class='del'>-	BonoboObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalClass {</div><div class='del'>-	BonoboObjectClass parent_class;</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'>-		    Evolution_Calendar_Cal corba_cal,</div><div class='del'>-		    CalBackend *backend,</div><div class='del'>-		    Evolution_Calendar_Listener listener);</div><div class='del'>-Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);</div><div class='del'>-</div><div class='del'>-Cal *cal_new (CalBackend *backend, Evolution_Calendar_Listener listener);</div><div class='del'>-</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'>-POA_Evolution_Calendar_Cal__epv *cal_get_epv (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/job.c b/calendar/pcs/job.c<br/>deleted file mode 100644<br/>index d97df6d883..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/job.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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 c9bce24dd4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/job.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@helixcode.com&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'>-#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/camel/.cvsignore b/camel/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/.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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 46e9046856..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/ChangeLog?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3864 +0,0 @@</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 578cd660fa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +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</div><div class='del'>-</div><div class='del'>-libcamelincludedir = $(includedir)/camel</div><div class='del'>-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcamel.la</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	$(UNICODE_CFLAGS)			\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel\"</div><div class='del'>-</div><div class='del'>-libcamel_la_SOURCES = 				\</div><div class='del'>-	camel.c					\</div><div class='del'>-	camel-data-wrapper.c			\</div><div class='del'>-	camel-exception.c			\</div><div class='del'>-	camel-folder.c				\</div><div class='del'>-	camel-folder-search.c			\</div><div class='del'>-	camel-folder-summary.c			\</div><div class='del'>-	camel-medium.c				\</div><div class='del'>-	camel-mime-message.c			\</div><div class='del'>-	camel-mime-part.c			\</div><div class='del'>-	camel-mime-part-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-provider.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-stream.c				\</div><div class='del'>-	camel-stream-buffer.c			\</div><div class='del'>-	camel-stream-fs.c			\</div><div class='del'>-	camel-stream-mem.c			\</div><div class='del'>-	camel-transport.c			\</div><div class='del'>-	camel-url.c				\</div><div class='del'>-	gmime-content-field.c			\</div><div class='del'>-	gstring-util.c				\</div><div class='del'>-	hash-table-utils.c			\</div><div class='del'>-	md5-utils.c				\</div><div class='del'>-	string-utils.c				\</div><div class='del'>-	camel-mime-parser.c			\</div><div class='del'>-	camel-mime-utils.c			\</div><div class='del'>-	camel-mime-filter.c			\</div><div class='del'>-	camel-mime-filter-basic.c		\</div><div class='del'>-	camel-mime-filter-save.c		\</div><div class='del'>-	camel-mime-filter-charset.c		\</div><div class='del'>-	camel-mime-filter-index.c		\</div><div class='del'>-	camel-mime-filter-from.c		\</div><div class='del'>-	camel-mime-filter-crlf.c		\</div><div class='del'>-	camel-stream-filter.c			\</div><div class='del'>-	camel-address.c				\</div><div class='del'>-	camel-internet-address.c</div><div class='del'>-</div><div class='del'>-libcamelinclude_HEADERS =			\</div><div class='del'>-	camel.h					\</div><div class='del'>-	camel-data-wrapper.h			\</div><div class='del'>-	camel-exception.h			\</div><div class='del'>-	camel-folder.h				\</div><div class='del'>-	camel-folder-search.h			\</div><div class='del'>-	camel-folder-summary.h			\</div><div class='del'>-	camel-medium.h				\</div><div class='del'>-	camel-mime-message.h			\</div><div class='del'>-	camel-mime-part.h			\</div><div class='del'>-	camel-mime-part-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-provider.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-stream.h				\</div><div class='del'>-	camel-stream-buffer.h			\</div><div class='del'>-	camel-stream-fs.h			\</div><div class='del'>-	camel-stream-mem.h			\</div><div class='del'>-	camel-transport.h			\</div><div class='del'>-	camel-types.h				\</div><div class='del'>-	camel-url.h				\</div><div class='del'>-	gmime-content-field.h			\</div><div class='del'>-	gstring-util.h				\</div><div class='del'>-	hash-table-utils.h			\</div><div class='del'>-	md5-utils.h				\</div><div class='del'>-	string-utils.h				\</div><div class='del'>-	camel-exception-list.def		\</div><div class='del'>-	camel-mime-parser.h			\</div><div class='del'>-	camel-mime-utils.h			\</div><div class='del'>-	camel-mime-filter.h			\</div><div class='del'>-	camel-mime-filter-basic.h		\</div><div class='del'>-	camel-mime-filter-save.h		\</div><div class='del'>-	camel-mime-filter-charset.h		\</div><div class='del'>-	camel-mime-filter-index.h		\</div><div class='del'>-	camel-mime-filter-from.h		\</div><div class='del'>-	camel-mime-filter-crlf.h		\</div><div class='del'>-	camel-stream-filter.h			\</div><div class='del'>-	camel-address.h				\</div><div class='del'>-	camel-internet-address.h</div><div class='del'>-</div><div class='del'>-libcamel_extra_sources =			\</div><div class='del'>-	camel-arg-collector.c</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'>-EXTRA_DIST =					\</div><div class='del'>-	$(libcamel_extra_sources)		\</div><div class='del'>-	README </div><div class='del'>-</div><div class='del'>-#noinst_PROGRAMS =				\</div><div class='del'>-#	camel-mime-filter-from</div><div class='del'>-#</div><div class='del'>-#camel_mime_filter_from_SOURCES = 		\</div><div class='del'>-#	camel-mime-filter-from.c</div><div class='del'>-#</div><div class='del'>-#camel_mime_filter_from_LDADD = 		\</div><div class='del'>-#	../camel/libcamel.la			\</div><div class='del'>-#	../e-util/libeutil.la			\</div><div class='del'>-#	../libibex/libibex.la			\</div><div class='del'>-#	$(GNOME_LIBDIR)				\</div><div class='del'>-#	$(GNOMEUI_LIBS)				\</div><div class='del'>-#	$(INTLLIBS)				\</div><div class='del'>-#	$(PTHREAD_LIB)				\</div><div class='del'>-#	$(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='head'>diff --git a/camel/README b/camel/README<br/>deleted file mode 100644<br/>index f020174d5e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/README?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +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 will be a generic messaging library. It will evntually support </div><div class='del'>-the standard messaging system for receiving and sending messages.</div><div class='del'>-It aims at being the backend for the future gnome-mailer system.</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'>-Please, before starting anything, wait for me to finish the abstract</div><div class='del'>-classes. Some parts are not definitive yet.</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 91774e7339..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/README.COPYRIGHT?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/README.COPYRIGHT</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +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 softwares with licenses incompatible with the</div><div class='del'>-LGPL. For this reason, the copyright has to be owned by a unique</div><div class='del'>-person.  Be sure, however, that Camel will always be available under</div><div class='del'>-the LGPL.  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'>-LGPL.</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'>- *</div><div class='del'>- * Copyright 199x, 200x Helix Code, Inc. (http://www.helixcode.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 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 name list after this</div><div class='del'>-header.</div><div class='del'>-</div><div class='del'>-Please contact me (Bertrand.Guiheneuf@aful.org) 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'>-Bertrand.</div><div class='del'>-</div><div class='del'>-</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/camel-address.c b/camel/camel-address.c<br/>deleted file mode 100644<br/>index 8056c121c8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-address.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,151 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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_finalise   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_address_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_address_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'>-			"CamelAddress",</div><div class='del'>-			sizeof (CamelAddress),</div><div class='del'>-			sizeof (CamelAddressClass),</div><div class='del'>-			(GtkClassInitFunc) camel_address_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_address_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 (camel_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'>-camel_address_class_init (CamelAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_address_parent = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_address_finalise;</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'>-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_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	camel_address_remove((CamelAddress *)obj, -1);</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)(camel_address_parent))-&gt;finalize((GtkObject *)obj);</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 ( gtk_type_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'>-/**</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(IS_CAMEL_ADDRESS(a), -1);</div><div class='del'>-</div><div class='del'>-	return ((CamelAddressClass *)((GtkObject *)a)-&gt;klass)-&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(IS_CAMEL_ADDRESS(a), NULL);</div><div class='del'>-</div><div class='del'>-	return ((CamelAddressClass *)((GtkObject *)a)-&gt;klass)-&gt;encode(a);</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(IS_CAMEL_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'>-			((CamelAddressClass *)((GtkObject *)a)-&gt;klass)-&gt;remove(a, index);</div><div class='del'>-	} else {</div><div class='del'>-		((CamelAddressClass *)((GtkObject *)a)-&gt;klass)-&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 d035f20e00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-address.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_ADDRESS(obj)         GTK_CHECK_CAST (obj, camel_address_get_type (), CamelAddress)</div><div class='del'>-#define CAMEL_ADDRESS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass)</div><div class='del'>-#define IS_CAMEL_ADDRESS(obj)      GTK_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'>-	void  (*remove)		(CamelAddress *, int index);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		camel_address_get_type	(void);</div><div class='del'>-CamelAddress   *camel_address_new	(void);</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'>-</div><div class='del'>-void		camel_address_remove	(CamelAddress *, int index);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_ADDRESS_H */</div><div class='head'>diff --git a/camel/camel-arg-collector.c b/camel/camel-arg-collector.c<br/>deleted file mode 100644<br/>index 44b9e2d99b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-arg-collector.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-arg-collector.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-/* GTK - The GIMP Toolkit</div><div class='del'>- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald</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 as published by the Free Software Foundation; either</div><div class='del'>- * version 2 of the License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This 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 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'>-/*</div><div class='del'>- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS</div><div class='del'>- * file for a list of people on the GTK+ Team.  See the ChangeLog</div><div class='del'>- * files for a list of changes.  These files are distributed with</div><div class='del'>- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * included in camel because it is not exported </div><div class='del'>- * by gtk</div><div class='del'>- *</div><div class='del'>- * Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* collect a single argument value from a va_list.</div><div class='del'>- * this is implemented as a huge macro &lt;shrug&gt;, because we can't</div><div class='del'>- * pass va_list variables by reference on some systems.</div><div class='del'>- * the corresponding prototype would be:</div><div class='del'>- * static inline gchar*</div><div class='del'>- * gtk_arg_collect_value (GtkArg  *arg,</div><div class='del'>- *		          va_list  var_args);</div><div class='del'>- */</div><div class='del'>-#define	CAMEL_ARG_COLLECT_VALUE(arg, var_args, _error)	\</div><div class='del'>-G_STMT_START { \</div><div class='del'>-  gchar *error_msg; \</div><div class='del'>-  GtkType fundamental_type; \</div><div class='del'>-  \</div><div class='del'>-  fundamental_type = GTK_FUNDAMENTAL_TYPE (arg-&gt;type); \</div><div class='del'>-  if (fundamental_type &gt; GTK_TYPE_FUNDAMENTAL_LAST) \</div><div class='del'>-    { \</div><div class='del'>-      fundamental_type = gtk_type_get_varargs_type (fundamental_type); \</div><div class='del'>-      if (!fundamental_type) \</div><div class='del'>-        fundamental_type = GTK_FUNDAMENTAL_TYPE (arg-&gt;type); \</div><div class='del'>-    } \</div><div class='del'>- \</div><div class='del'>-  error_msg = NULL; \</div><div class='del'>-  switch (fundamental_type) \</div><div class='del'>-    { \</div><div class='del'>-    case GTK_TYPE_INVALID: \</div><div class='del'>-      error_msg = g_strdup ("invalid untyped argument"); \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-    case GTK_TYPE_NONE: \</div><div class='del'>-      /* we just ignore this type, since it arithmetically just requires \</div><div class='del'>-       * us to not move the var_args pointer any further. callers need to \</div><div class='del'>-       * check for the validity of GTK_TYPE_NONE themselves. \</div><div class='del'>-       * \</div><div class='del'>-       * error_msg = g_strdup ("invalid argument type `void'"); \</div><div class='del'>-       */ \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-      /* everything smaller than an int is guarranteed to be \</div><div class='del'>-       * passed as an int \</div><div class='del'>-       */ \</div><div class='del'>-    case GTK_TYPE_CHAR: \</div><div class='del'>-      GTK_VALUE_CHAR (*arg) = va_arg (var_args, gint); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_UCHAR: \</div><div class='del'>-      GTK_VALUE_UCHAR (*arg) = va_arg (var_args, guint); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_BOOL: \</div><div class='del'>-      GTK_VALUE_BOOL (*arg) = va_arg (var_args, gint); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_INT: \</div><div class='del'>-      GTK_VALUE_INT (*arg) = va_arg (var_args, gint); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_UINT: \</div><div class='del'>-      GTK_VALUE_UINT (*arg) = va_arg (var_args, guint); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_ENUM: \</div><div class='del'>-      GTK_VALUE_ENUM (*arg) = va_arg (var_args, gint); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_FLAGS: \</div><div class='del'>-      GTK_VALUE_FLAGS (*arg) = va_arg (var_args, guint); \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-      /* we collect longs as glongs since they differ in size with \</div><div class='del'>-       * integers on some platforms \</div><div class='del'>-       */ \</div><div class='del'>-    case GTK_TYPE_LONG: \</div><div class='del'>-      GTK_VALUE_LONG (*arg) = va_arg (var_args, glong); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_ULONG: \</div><div class='del'>-      GTK_VALUE_ULONG (*arg) = va_arg (var_args, gulong); \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-      /* floats are always passed as doubles \</div><div class='del'>-       */ \</div><div class='del'>-    case GTK_TYPE_FLOAT: \</div><div class='del'>-      /* GTK_VALUE_FLOAT (*arg) = va_arg (var_args, gfloat); */ \</div><div class='del'>-      GTK_VALUE_FLOAT (*arg) = va_arg (var_args, gdouble); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_DOUBLE: \</div><div class='del'>-      GTK_VALUE_DOUBLE (*arg) = va_arg (var_args, gdouble); \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-      /* collect pointer values \</div><div class='del'>-       */ \</div><div class='del'>-    case GTK_TYPE_STRING: \</div><div class='del'>-      GTK_VALUE_STRING (*arg) = va_arg (var_args, gchar*); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_POINTER: \</div><div class='del'>-      GTK_VALUE_POINTER (*arg) = va_arg (var_args, gpointer); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_BOXED: \</div><div class='del'>-      GTK_VALUE_BOXED (*arg) = va_arg (var_args, gpointer); \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-      /* structured types \</div><div class='del'>-       */ \</div><div class='del'>-    case GTK_TYPE_SIGNAL: \</div><div class='del'>-      GTK_VALUE_SIGNAL (*arg).f = va_arg (var_args, GtkSignalFunc); \</div><div class='del'>-      GTK_VALUE_SIGNAL (*arg).d = va_arg (var_args, gpointer); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_ARGS: \</div><div class='del'>-      GTK_VALUE_ARGS (*arg).n_args = va_arg (var_args, gint); \</div><div class='del'>-      GTK_VALUE_ARGS (*arg).args = va_arg (var_args, GtkArg*); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_FOREIGN: \</div><div class='del'>-      GTK_VALUE_FOREIGN (*arg).data = va_arg (var_args, gpointer); \</div><div class='del'>-      GTK_VALUE_FOREIGN (*arg).notify = va_arg (var_args, GtkDestroyNotify); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_CALLBACK: \</div><div class='del'>-      GTK_VALUE_CALLBACK (*arg).marshal = va_arg (var_args, GtkCallbackMarshal); \</div><div class='del'>-      GTK_VALUE_CALLBACK (*arg).data = va_arg (var_args, gpointer); \</div><div class='del'>-      GTK_VALUE_CALLBACK (*arg).notify = va_arg (var_args, GtkDestroyNotify); \</div><div class='del'>-      break; \</div><div class='del'>-    case GTK_TYPE_C_CALLBACK: \</div><div class='del'>-      GTK_VALUE_C_CALLBACK (*arg).func = va_arg (var_args, GtkFunction); \</div><div class='del'>-      GTK_VALUE_C_CALLBACK (*arg).func_data = va_arg (var_args, gpointer); \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-      /* we do some extra sanity checking when collecting objects, \</div><div class='del'>-       * i.e. if the object pointer is not NULL, we check whether we \</div><div class='del'>-       * actually got an object pointer within the desired class branch. \</div><div class='del'>-       */ \</div><div class='del'>-    case GTK_TYPE_OBJECT: \</div><div class='del'>-      GTK_VALUE_OBJECT (*arg) = va_arg (var_args, GtkObject*); \</div><div class='del'>-      if (GTK_VALUE_OBJECT (*arg) != NULL) \</div><div class='del'>-	{ \</div><div class='del'>-	  register GtkObject *object = GTK_VALUE_OBJECT (*arg); \</div><div class='del'>-	   \</div><div class='del'>-	  if (object-&gt;klass == NULL) \</div><div class='del'>-	    error_msg = g_strconcat ("invalid unclassed object pointer for argument type `", \</div><div class='del'>-				     gtk_type_name (arg-&gt;type), \</div><div class='del'>-				     "'", \</div><div class='del'>-				     NULL); \</div><div class='del'>-	  else if (!gtk_type_is_a (GTK_OBJECT_TYPE (object), arg-&gt;type)) \</div><div class='del'>-	    error_msg = g_strconcat ("invalid object `", \</div><div class='del'>-				     gtk_type_name (GTK_OBJECT_TYPE (object)), \</div><div class='del'>-				     "' for argument type `", \</div><div class='del'>-				     gtk_type_name (arg-&gt;type), \</div><div class='del'>-				     "'", \</div><div class='del'>-				     NULL); \</div><div class='del'>-	} \</div><div class='del'>-      break; \</div><div class='del'>- \</div><div class='del'>-    default: \</div><div class='del'>-      error_msg = g_strconcat ("unsupported argument type `", \</div><div class='del'>-			       gtk_type_name (arg-&gt;type), \</div><div class='del'>-			       "'", \</div><div class='del'>-			       NULL); \</div><div class='del'>-      break; \</div><div class='del'>-    } \</div><div class='del'>-   \</div><div class='del'>-  _error = error_msg; /* return error_msg; */ \</div><div class='del'>-} G_STMT_END</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 94c222e9a4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-wrapper.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-data-wrapper.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,288 +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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</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 (GTK_OBJECT (so)-&gt;klass)</div><div class='del'>-</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 GMimeContentField *get_mime_type_field (CamelDataWrapper *data_wrapper);</div><div class='del'>-static void set_mime_type_field (CamelDataWrapper *data_wrapper, GMimeContentField *mime_type);</div><div class='del'>-static void finalize (GtkObject *object);</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_data_wrapper_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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'>-</div><div class='del'>-	camel_data_wrapper_class-&gt;construct_from_stream = construct_from_stream;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	gtk_object_class-&gt;finalize = finalize;</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;mime_type = gmime_content_field_new (NULL, NULL);</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'>-camel_data_wrapper_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_data_wrapper_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_data_wrapper_type) {</div><div class='del'>-		GtkTypeInfo camel_data_wrapper_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelDataWrapper",</div><div class='del'>-			sizeof (CamelDataWrapper),</div><div class='del'>-			sizeof (CamelDataWrapperClass),</div><div class='del'>-			(GtkClassInitFunc) camel_data_wrapper_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_data_wrapper_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'>-		camel_data_wrapper_type = gtk_type_unique (camel_object_get_type (), &amp;camel_data_wrapper_info);</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'>-</div><div class='del'>-static void</div><div class='del'>-finalize (GtkObject *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'>-	if (camel_data_wrapper-&gt;mime_type)</div><div class='del'>-		gmime_content_field_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'>-		gtk_object_unref (GTK_OBJECT (camel_data_wrapper-&gt;stream));</div><div class='del'>-</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 int</div><div class='del'>-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</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'>-	if (camel_stream_reset (data_wrapper-&gt;stream) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_stream_write_to_stream (data_wrapper-&gt;stream, stream);</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 *)gtk_type_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'>-		gtk_object_unref((GtkObject *)data_wrapper-&gt;stream);</div><div class='del'>-</div><div class='del'>-	data_wrapper-&gt;stream = stream;</div><div class='del'>-	gtk_object_ref (GTK_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'>-	gmime_content_field_construct_from_string (data_wrapper-&gt;mime_type,</div><div class='del'>-						   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 gmime_content_field_get_mime_type (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'>- **/</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 GMimeContentField *</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'>-GMimeContentField *</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'>-		     GMimeContentField *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'>-		gmime_content_field_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'>-		gmime_content_field_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'>-					GMimeContentField *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='head'>diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h<br/>deleted file mode 100644<br/>index 8df09fa848..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-wrapper.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-data-wrapper.h</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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-</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/gmime-content-field.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)     (GTK_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))</div><div class='del'>-#define CAMEL_DATA_WRAPPER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))</div><div class='del'>-#define CAMEL_IS_DATA_WRAPPER(o)    (GTK_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'>-</div><div class='del'>-	GMimeContentField *mime_type;</div><div class='del'>-	CamelStream *stream;</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_output_stream)      (CamelDataWrapper *data_wrapper,</div><div class='del'>-						       CamelStream *stream);</div><div class='del'>-	CamelStream *       (*get_output_stream)      (CamelDataWrapper *data_wrapper);</div><div class='del'>-</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'>-	GMimeContentField * (*get_mime_type_field)    (CamelDataWrapper *data_wrapper);</div><div class='del'>-	void                (*set_mime_type_field)    (CamelDataWrapper *data_wrapper,</div><div class='del'>-						       GMimeContentField *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'>-} CamelDataWrapperClass;</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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'>-GMimeContentField * 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'>-								 GMimeContentField *mime_type);</div><div class='del'>-</div><div class='del'>-int                 camel_data_wrapper_construct_from_stream    (CamelDataWrapper *data_wrapper,</div><div class='del'>-								 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_DATA_WRAPPER_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 cdb95b1a81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception-list.def?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-exception-list.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +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='head'>diff --git a/camel/camel-exception.c b/camel/camel-exception.c<br/>deleted file mode 100644<br/>index cf5daff9d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-exception.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-</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'>-	ex = g_new (CamelException, 1);</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'>-	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) return;</div><div class='del'>-	</div><div class='del'>-	/* free the description text */</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'>-</div><div class='del'>-	/* set the Exception Id to NULL */</div><div class='del'>-	exception-&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'>-</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) return;</div><div class='del'>-	</div><div class='del'>-	/* free the description text */</div><div class='del'>-	if (exception-&gt;desc)</div><div class='del'>-		g_free (exception-&gt;desc);</div><div class='del'>-       	/* free the exeption itself */</div><div class='del'>-	g_free (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 no exception is given, do nothing */</div><div class='del'>-	if (!ex) return;</div><div class='del'>-</div><div class='del'>-	ex-&gt;id = id;</div><div class='del'>-</div><div class='del'>-	/* remove the previous exception description */</div><div class='del'>-	if (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'>-</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'>-	gchar *tmp_desc_string;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* if no exception is given, do nothing */</div><div class='del'>-	if (!ex) return;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* create the temporary exception string */</div><div class='del'>-	va_start(args, format);</div><div class='del'>-	tmp_desc_string = g_strdup_vprintf (format, args);</div><div class='del'>-	va_end (args);</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* now set the exception. We don't call</div><div class='del'>-	   camel_exception_set because we want to </div><div class='del'>-	   avoid a useless strdup () */</div><div class='del'>-	ex-&gt;id = id;</div><div class='del'>-	</div><div class='del'>-	/* remove the previous exception description */</div><div class='del'>-	if (ex-&gt;desc)</div><div class='del'>-		g_free (ex-&gt;desc);</div><div class='del'>-	ex-&gt;desc = g_strdup (tmp_desc_string);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</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_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_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'>-</div><div class='del'>-</div><div class='del'>-</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_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'>-		return CAMEL_EXCEPTION_NONE;</div><div class='del'>-}</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_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'>-	if (ex)</div><div class='del'>-		return ex-&gt;desc;</div><div class='del'>-	else </div><div class='del'>-		return NULL;</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 d5c93e5941..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-exception.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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;glib.h&gt;</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 gchar *             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-folder-pt-proxy.c b/camel/camel-folder-pt-proxy.c<br/>deleted file mode 100644<br/>index 65f74ecc4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-pt-proxy.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder-pt-proxy.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,809 +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-pt-proxy.c : proxy folder using posix threads */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-folder-pt-proxy.h"</div><div class='del'>-#include "camel-marshal-utils.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include &lt;pthread.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;errno.h&gt;</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'>-/* Returns the class for CamelFolderPtProxy and CamelFolder objects */</div><div class='del'>-#define CFPP_CLASS(so) CAMEL_FOLDER_PT_PROXY_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum CamelFolderFunc {</div><div class='del'>-	CAMEL_FOLDER_OPEN,</div><div class='del'>-	CAMEL_FOLDER_CLOSE,</div><div class='del'>-	CAMEL_FOLDER__LAST_FUNC</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelFuncDef _camel_func_def [CAMEL_FOLDER__LAST_FUNC];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void _init (CamelFolder *folder, CamelStore *parent_store, </div><div class='del'>-		   CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		   gchar separator, CamelException *ex);</div><div class='del'>-static void _open_async (CamelFolder *folder, </div><div class='del'>-			 CamelFolderOpenMode mode, </div><div class='del'>-			 CamelFolderAsyncCallback callback, </div><div class='del'>-			 gpointer user_data, </div><div class='del'>-			 CamelException *ex);</div><div class='del'>-static void _close_async (CamelFolder *folder, </div><div class='del'>-		    gboolean expunge, </div><div class='del'>-		    CamelFolderAsyncCallback callback, </div><div class='del'>-		    gpointer user_data, </div><div class='del'>-		    CamelException *ex);</div><div class='del'>-static void _open (CamelFolder *folder, </div><div class='del'>-		   CamelFolderOpenMode mode, </div><div class='del'>-		   CamelException *ex);</div><div class='del'>-static void _close (CamelFolder *folder, </div><div class='del'>-		    gboolean expunge, </div><div class='del'>-		    CamelException *ex);</div><div class='del'>-static void _set_name (CamelFolder *folder, </div><div class='del'>-		       const gchar *name, </div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const gchar *_get_name (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static const gchar *_get_full_name (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean _can_hold_folders (CamelFolder *folder);</div><div class='del'>-static gboolean _can_hold_messages(CamelFolder *folder);</div><div class='del'>-static gboolean _exists (CamelFolder  *folder, CamelException *ex);</div><div class='del'>-static gboolean _is_open (CamelFolder *folder);</div><div class='del'>-static CamelFolder *_get_subfolder (CamelFolder *folder, const gchar *folder_name, CamelException *ex);</div><div class='del'>-static gboolean _create (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);</div><div class='del'>-static gboolean _delete_messages (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelFolder *_get_parent_folder (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelStore *_get_parent_store (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelFolderOpenMode _get_mode (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GList *_list_subfolders (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GList *_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *_get_message_by_number (CamelFolder *folder, gint number, CamelException *ex);</div><div class='del'>-static gint _get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-static const GList *_list_permanent_flags (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-static GList *_get_uid_list  (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void _finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_pt_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_folder_pt_proxy_class);</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_folder_pt_proxy_class);</div><div class='del'>-	CamelFolderPtProxyClass *proxy_class = camel_folder_pt_proxy_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_folder_get_type ());</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_folder_class-&gt;init = _init;</div><div class='del'>-	camel_folder_class-&gt;open = _open;</div><div class='del'>-	camel_folder_class-&gt;close = _close;</div><div class='del'>-#ifdef FOLDER_ASYNC_TEST</div><div class='del'>-	camel_folder_class-&gt;open_async = _open_async;</div><div class='del'>-	camel_folder_class-&gt;close_async = _close_async;</div><div class='del'>-#endif</div><div class='del'>-	camel_folder_class-&gt;get_name = _get_name;</div><div class='del'>-	camel_folder_class-&gt;can_hold_folders = _can_hold_folders;</div><div class='del'>- 	camel_folder_class-&gt;can_hold_messages = _can_hold_messages;</div><div class='del'>-	camel_folder_class-&gt;exists = _exists;</div><div class='del'>-	camel_folder_class-&gt;is_open = _is_open;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder = _get_subfolder;</div><div class='del'>-	camel_folder_class-&gt;create = _create;</div><div class='del'>-	camel_folder_class-&gt;delete = _delete;</div><div class='del'>-	camel_folder_class-&gt;delete_messages = _delete_messages;</div><div class='del'>-	camel_folder_class-&gt;get_parent_folder = _get_parent_folder;</div><div class='del'>-	camel_folder_class-&gt;get_parent_store = _get_parent_store;</div><div class='del'>-	camel_folder_class-&gt;get_mode = _get_mode;</div><div class='del'>-	camel_folder_class-&gt;list_subfolders = _list_subfolders;</div><div class='del'>-	camel_folder_class-&gt;expunge = _expunge;</div><div class='del'>-	camel_folder_class-&gt;get_message_by_number = _get_message_by_number;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = _get_message_count;</div><div class='del'>-	camel_folder_class-&gt;append_message = _append_message;</div><div class='del'>-	camel_folder_class-&gt;list_permanent_flags = _list_permanent_flags;</div><div class='del'>-	camel_folder_class-&gt;copy_message_to = _copy_message_to;</div><div class='del'>-	camel_folder_class-&gt;get_message_uid = _get_message_uid;</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = _get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;get_uid_list = _get_uid_list;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	gtk_object_class-&gt;finalize = _finalize;</div><div class='del'>-</div><div class='del'>-	/* function definition for proxying */</div><div class='del'>-	proxy_class-&gt;open_func_def = </div><div class='del'>-		camel_func_def_new (camel_marshal_NONE__POINTER_INT_POINTER_POINTER, </div><div class='del'>-				    4, </div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_INT,</div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER);</div><div class='del'>-	proxy_class-&gt;open_cb_def = </div><div class='del'>-		camel_func_def_new (camel_marshal_NONE__POINTER_POINTER_POINTER, </div><div class='del'>-				    3, </div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	proxy_class-&gt;close_func_def = </div><div class='del'>-		camel_func_def_new (camel_marshal_NONE__POINTER_BOOL_POINTER_POINTER, </div><div class='del'>-				    4, </div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_BOOL,</div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER);</div><div class='del'>-	proxy_class-&gt;close_cb_def = </div><div class='del'>-		camel_func_def_new (camel_marshal_NONE__POINTER_POINTER_POINTER, </div><div class='del'>-				    3, </div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	proxy_class-&gt;set_name_func_def = </div><div class='del'>-		camel_func_def_new (camel_marshal_NONE__POINTER_BOOL_POINTER_POINTER, </div><div class='del'>-				    4, </div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_BOOL,</div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER);</div><div class='del'>-	proxy_class-&gt;set_name_cb_def = </div><div class='del'>-		camel_func_def_new (camel_marshal_NONE__POINTER_POINTER_POINTER, </div><div class='del'>-				    3, </div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER,</div><div class='del'>-				    GTK_TYPE_POINTER);</div><div class='del'>-</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'>-camel_folder_pt_proxy_init (CamelFolderPtProxy *folder_pt_proxy)</div><div class='del'>-{</div><div class='del'>-	folder_pt_proxy-&gt;thread_ex = camel_exception_new ();	</div><div class='del'>-	folder_pt_proxy-&gt;pud = g_new (_ProxyCbUserData, 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'>-GtkType</div><div class='del'>-camel_folder_pt_proxy_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_folder_pt_proxy_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_pt_proxy_type)	{</div><div class='del'>-		GtkTypeInfo camel_folder_pt_proxy_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelFolderPtProxy",</div><div class='del'>-			sizeof (CamelFolderPtProxy),</div><div class='del'>-			sizeof (CamelFolderPtProxyClass),</div><div class='del'>-			(GtkClassInitFunc) camel_folder_pt_proxy_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_folder_pt_proxy_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'>-		camel_folder_pt_proxy_type = gtk_type_unique (camel_folder_get_type (), &amp;camel_folder_pt_proxy_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_folder_pt_proxy_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *camel_folder = CAMEL_FOLDER (object);</div><div class='del'>-	CamelFolderPtProxy *camel_folder_pt_proxy = CAMEL_FOLDER_PT_PROXY (camel_folder);</div><div class='del'>-</div><div class='del'>-	camel_exception_free (camel_folder_pt_proxy-&gt;thread_ex);</div><div class='del'>-	g_free (camel_folder_pt_proxy-&gt;pud);</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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*********/</div><div class='del'>-</div><div class='del'>-/**** Operations implementation ****/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gpointer</div><div class='del'>-_proxy_cb_user_data (_ProxyCbUserData *pud,</div><div class='del'>-		     CamelFolderAsyncCallback real_callback, </div><div class='del'>-		     CamelFolderPtProxy *proxy_folder, </div><div class='del'>-		     CamelException *ex,</div><div class='del'>-		     gpointer real_user_data)</div><div class='del'>-{</div><div class='del'>-	pud-&gt;real_callback = real_callback;</div><div class='del'>-	pud-&gt;proxy_folder = proxy_folder;</div><div class='del'>-	pud-&gt;ex = ex;</div><div class='del'>-	pud-&gt;real_user_data = real_user_data;</div><div class='del'>-	return (gpointer)pud;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ******** */</div><div class='del'>-</div><div class='del'>-/* thread-&gt;init implementation */</div><div class='del'>-static void</div><div class='del'>-_init (CamelFolder *folder, CamelStore *parent_store, </div><div class='del'>-       CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-       gchar separator, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	parent_class-&gt;init (folder, parent_store, parent_folder,</div><div class='del'>-			    name, separator, ex);</div><div class='del'>-	if (ex-&gt;id != CAMEL_EXCEPTION_NONE)</div><div class='del'>-		return;</div><div class='del'>-#warning use proxy store here  </div><div class='del'>-	CF_CLASS (folder)-&gt;init (CAMEL_FOLDER_PT_PROXY (folder)-&gt;real_folder, </div><div class='del'>-				 parent_store, parent_folder, name,</div><div class='del'>-				 separator, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* a little bit of explanation for the folder_class-&gt;open </div><div class='del'>- * method implementation : </div><div class='del'>- * </div><div class='del'>- * the proxy object "open" method is called by the client </div><div class='del'>- * program in the main thread. This method creates a </div><div class='del'>- * CamelOp object containing all the necessary informations </div><div class='del'>- * to call the corresponding "open" method on the real </div><div class='del'>- * folder object in the child thread. This CamelOp object </div><div class='del'>- * is thus pushed in a queue in the main thread (see the </div><div class='del'>- * CamelThreadProxy structure for more details). </div><div class='del'>- * The operations in this queue are executed one by one</div><div class='del'>- * in a child thread. </div><div class='del'>- * Once the "open" method of the real object is finished, </div><div class='del'>- * it calls a callback. This callback is not the one supplied</div><div class='del'>- * by the client object. Instead, the _folder_open_cb()</div><div class='del'>- * function is called (in the child thread) which pushes</div><div class='del'>- * the real callback function in another operation queue.</div><div class='del'>- * The real callback is then called in the main thread. </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* folder-&gt;open implementation */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * proxy callback. Called in the child thread by the </div><div class='del'>- * real folder "open" method when it is completed </div><div class='del'>- */</div><div class='del'>-static void </div><div class='del'>-_folder_open_cb (CamelFolder *folder,</div><div class='del'>-		 gpointer user_data,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelOp *cb;</div><div class='del'>-	_ProxyCbUserData *pud;</div><div class='del'>-	CamelFuncDef *cb_def;</div><div class='del'>-</div><div class='del'>-	g_print ("%s: %s(): Bailing. This function is incredibly"</div><div class='del'>-		 " broken; the \"*pud\" pointer isn't allocated"</div><div class='del'>-		 " memory anywhere.\n");</div><div class='del'>-	return;</div><div class='del'>-	</div><div class='del'>-	/* transfer the exception information from "ex" to the </div><div class='del'>-	 * client supplied exception (kept in pud-&gt;ex) */ 	 </div><div class='del'>-	camel_exception_xfer (pud-&gt;ex, ex);</div><div class='del'>-</div><div class='del'>-	/* create an operation which will call the real client</div><div class='del'>-	 * supplied callback in the main thread */</div><div class='del'>-	cb_def = CAMEL_FOLDER_PT_PROXY_CLASS(pud-&gt;proxy_folder)-&gt;open_cb_def;</div><div class='del'>-	cb = camel_marshal_create_op (cb_def,</div><div class='del'>-				      pud-&gt;real_callback, </div><div class='del'>-				      pud-&gt;proxy_folder, </div><div class='del'>-				      pud-&gt;real_user_data,</div><div class='del'>-				      pud-&gt;ex);</div><div class='del'>-	camel_thread_proxy_push_cb (pud-&gt;proxy_folder-&gt;proxy_object, cb);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_open_async (CamelFolder *folder, </div><div class='del'>-	     CamelFolderOpenMode mode, </div><div class='del'>-	     CamelFolderAsyncCallback callback, </div><div class='del'>-	     gpointer user_data, </div><div class='del'>-	     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-	CamelOp *op;</div><div class='del'>-	CamelFuncDef *func_def;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	</div><div class='del'>-	/* create an operation corresponding to the "open"</div><div class='del'>-	 * method of the real object. The operation definition</div><div class='del'>-	 * is common to all instances of the CamelFolderPtProxy </div><div class='del'>-	 * class so it is contained in the CamelFolderPtProxyClass</div><div class='del'>-	 * structure. */</div><div class='del'>-	func_def = CAMEL_FOLDER_PT_PROXY_CLASS(proxy_folder)-&gt;open_func_def;</div><div class='del'>-	if (callback)		</div><div class='del'>-		op = camel_marshal_create_op (func_def, </div><div class='del'>-					      CAMEL_FOLDER_CLASS (proxy_folder-&gt;real_folder)-&gt;open_async,</div><div class='del'>-					      proxy_folder-&gt;real_folder,</div><div class='del'>-					      mode,</div><div class='del'>-					      _folder_open_cb,</div><div class='del'>-					      _proxy_cb_user_data (proxy_folder-&gt;pud, callback, proxy_folder, ex, user_data),</div><div class='del'>-					      proxy_folder-&gt;thread_ex);</div><div class='del'>-	else </div><div class='del'>-		op = camel_marshal_create_op (func_def, </div><div class='del'>-					      CAMEL_FOLDER_CLASS (proxy_folder-&gt;real_folder)-&gt;open_async,</div><div class='del'>-					      proxy_folder-&gt;real_folder,</div><div class='del'>-					      mode,</div><div class='del'>-					      NULL,</div><div class='del'>-					      NULL,</div><div class='del'>-					      NULL);</div><div class='del'>-	/* push the operation in the operation queue. This operation </div><div class='del'>-	 * will be executed in a child thread but only one operation </div><div class='del'>-	 * will be executed at a time, so that folder implementations</div><div class='del'>-	 * don't have to be MultiThread safe. */</div><div class='del'>-	camel_thread_proxy_push_op (proxy_folder-&gt;proxy_object, op);				      	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void _open (CamelFolder *folder, </div><div class='del'>-		   CamelFolderOpenMode mode, </div><div class='del'>-		   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		open (proxy_folder-&gt;real_folder, mode, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* folder-&gt;close implementation */</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-_folder_close_cb (CamelFolder *folder,</div><div class='del'>-		  gpointer user_data,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelOp *cb;</div><div class='del'>-	_ProxyCbUserData *pud;</div><div class='del'>-	CamelFuncDef *cb_def;</div><div class='del'>-</div><div class='del'>-	g_print ("%s: %s(): Bailing. This function is incredibly"</div><div class='del'>-		 " broken; the \"*pud\" pointer isn't allocated"</div><div class='del'>-		 " memory anywhere.\n");</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-	camel_exception_xfer (pud-&gt;ex, ex);</div><div class='del'>-	cb_def = CAMEL_FOLDER_PT_PROXY_CLASS(pud-&gt;proxy_folder)-&gt;close_cb_def;</div><div class='del'>-	cb = camel_marshal_create_op (cb_def,</div><div class='del'>-				      pud-&gt;real_callback, </div><div class='del'>-				      pud-&gt;proxy_folder, </div><div class='del'>-				      pud-&gt;real_user_data,</div><div class='del'>-				      pud-&gt;ex);</div><div class='del'>-	camel_thread_proxy_push_cb (pud-&gt;proxy_folder-&gt;proxy_object, cb);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_close_async (CamelFolder *folder, </div><div class='del'>-	      gboolean expunge, </div><div class='del'>-	      CamelFolderAsyncCallback callback, </div><div class='del'>-	      gpointer user_data, </div><div class='del'>-	      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-	CamelOp *op;</div><div class='del'>-	CamelFuncDef *func_def;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	</div><div class='del'>-	func_def = CAMEL_FOLDER_PT_PROXY_CLASS(proxy_folder)-&gt;close_func_def;</div><div class='del'>-	if (callback)		</div><div class='del'>-		op = camel_marshal_create_op (func_def, </div><div class='del'>-					      CAMEL_FOLDER_CLASS (proxy_folder-&gt;real_folder)-&gt;close_async,</div><div class='del'>-					      proxy_folder-&gt;real_folder,</div><div class='del'>-					      expunge,</div><div class='del'>-					      _folder_close_cb,</div><div class='del'>-					      _proxy_cb_user_data (proxy_folder-&gt;pud, callback, proxy_folder, ex, user_data),</div><div class='del'>-					      proxy_folder-&gt;thread_ex);</div><div class='del'>-	else </div><div class='del'>-		op = camel_marshal_create_op (func_def, </div><div class='del'>-					      CAMEL_FOLDER_CLASS (proxy_folder-&gt;real_folder)-&gt;close_async,</div><div class='del'>-					      proxy_folder-&gt;real_folder,</div><div class='del'>-					      expunge,</div><div class='del'>-					      NULL,</div><div class='del'>-					      NULL,</div><div class='del'>-					      NULL);</div><div class='del'>-	camel_thread_proxy_push_op (proxy_folder-&gt;proxy_object, op);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void _close (CamelFolder *folder, </div><div class='del'>-		    gboolean expunge, </div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		close (proxy_folder-&gt;real_folder, expunge, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* folder-&gt;get_name implementation */</div><div class='del'>-/* this one is not executed in a thread */</div><div class='del'>-static const gchar *</div><div class='del'>-_get_name (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_name (proxy_folder-&gt;real_folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* folder-&gt;get_full_name implementation */</div><div class='del'>-/* this one is not executed in a thread */</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-_get_full_name (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_full_name (proxy_folder-&gt;real_folder);</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'>-_can_hold_folders (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		can_hold_folders (proxy_folder-&gt;real_folder);</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'>-_can_hold_messages (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		can_hold_messages (proxy_folder-&gt;real_folder);</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'>-_exists (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		exists (proxy_folder-&gt;real_folder, ex);</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'>-_is_open (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		is_open (proxy_folder-&gt;real_folder);</div><div class='del'>-} </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_subfolder (CamelFolder *folder, const gchar *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_subfolder (proxy_folder-&gt;real_folder, folder_name, ex);</div><div class='del'>-}</div><div class='del'>-</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'>-_create(CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		create (proxy_folder-&gt;real_folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</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'>-_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		delete (proxy_folder-&gt;real_folder, recurse, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-_delete_messages (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		delete_messages (proxy_folder-&gt;real_folder, ex);</div><div class='del'>-}</div><div class='del'>-</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_parent_folder (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-#warning return proxy parent folder if any</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_parent_folder (proxy_folder-&gt;real_folder, ex);</div><div class='del'>-}</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 CamelStore *</div><div class='del'>-_get_parent_store (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_parent_store (proxy_folder-&gt;real_folder, ex);</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 CamelFolderOpenMode</div><div class='del'>-_get_mode (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_mode (proxy_folder-&gt;real_folder, ex);</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 GList *</div><div class='del'>-_list_subfolders (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		list_subfolders (proxy_folder-&gt;real_folder, ex);</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 GList *</div><div class='del'>-_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		expunge (proxy_folder-&gt;real_folder, ex);</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'>-_get_message_by_number (CamelFolder *folder, gint number, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_message_by_number (proxy_folder-&gt;real_folder, number, ex);</div><div class='del'>-}</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 gint</div><div class='del'>-_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_message_count (proxy_folder-&gt;real_folder, ex);</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'>-_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		append_message (proxy_folder-&gt;real_folder, message, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const GList *</div><div class='del'>-_list_permanent_flags (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		list_permanent_flags (proxy_folder-&gt;real_folder, 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'>-_copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		copy_message_to (proxy_folder-&gt;real_folder, message, dest_folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</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'>-</div><div class='del'>-static const gchar *</div><div class='del'>-_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_message_uid (proxy_folder-&gt;real_folder, message, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* the next two func are left there temporarily */</div><div class='del'>-#if 0</div><div class='del'>-static const gchar *</div><div class='del'>-_get_message_uid_by_number (CamelFolder *folder, gint message_number, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_message_uid_by_number (proxy_folder-&gt;real_folder, message_number, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_message_by_uid (proxy_folder-&gt;real_folder, uid, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-_get_uid_list  (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-</div><div class='del'>-	proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);</div><div class='del'>-	return CF_CLASS (proxy_folder-&gt;real_folder)-&gt;</div><div class='del'>-		get_uid_list (proxy_folder-&gt;real_folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='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-folder-pt-proxy.h b/camel/camel-folder-pt-proxy.h<br/>deleted file mode 100644<br/>index 7422786170..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-pt-proxy.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder-pt-proxy.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'>-/* camel-folder-pt-proxy.h : proxy folder using posix threads */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_FOLDER_PT_PROXY_H</div><div class='del'>-#define CAMEL_FOLDER_PT_PROXY_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-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-op-queue.h&gt;</div><div class='del'>-#include &lt;camel/camel-thread-proxy.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_PT_PROXY_TYPE     (camel_folder_pt_proxy_get_type ())</div><div class='del'>-#define CAMEL_FOLDER_PT_PROXY(obj)     (GTK_CHECK_CAST((obj), CAMEL_FOLDER_PT_PROXY_TYPE, CamelFolderPtProxy))</div><div class='del'>-#define CAMEL_FOLDER_PT_PROXY_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_PT_PROXY_TYPE, CamelFolderPtProxyClass))</div><div class='del'>-#define CAMEL_IS_FOLDER_PT_PROXY(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_PT_PROXY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderPtProxy CamelFolderPtProxy;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderAsyncCallback real_callback;</div><div class='del'>-	CamelFolderPtProxy *proxy_folder;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	gpointer real_user_data;</div><div class='del'>-} _ProxyCbUserData;</div><div class='del'>-</div><div class='del'>-struct _CamelFolderPtProxy {</div><div class='del'>-	CamelFolder parent;</div><div class='del'>-	</div><div class='del'>-	/* private fields */ </div><div class='del'>-	CamelFolder *real_folder;</div><div class='del'>-	CamelThreadProxy *proxy_object;</div><div class='del'>-	CamelException *thread_ex;</div><div class='del'>-	_ProxyCbUserData *pud;</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'>-	CamelFolderClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* functions and callbacks definition (for marshalling) */</div><div class='del'>-	CamelFuncDef *open_func_def;</div><div class='del'>-	CamelFuncDef *open_cb_def;</div><div class='del'>-	CamelFuncDef *close_func_def;</div><div class='del'>-	CamelFuncDef *close_cb_def;</div><div class='del'>-	CamelFuncDef *set_name_func_def;</div><div class='del'>-	CamelFuncDef *set_name_cb_def;</div><div class='del'>-</div><div class='del'>-} CamelFolderPtProxyClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType       camel_folder_pt_proxy_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_FOLDER_PT_PROXY_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 fa07fc819f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-search.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder-search.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,496 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-/* 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'>-#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'>-</div><div class='del'>-#include "camel-folder-search.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'>-};</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_header_contains(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'>-</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_finalise   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_folder_search_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_folder_search_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'>-			"CamelFolderSearch",</div><div class='del'>-			sizeof (CamelFolderSearch),</div><div class='del'>-			sizeof (CamelFolderSearchClass),</div><div class='del'>-			(GtkClassInitFunc) camel_folder_search_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_folder_search_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 (camel_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'>-camel_folder_search_class_init (CamelFolderSearchClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_folder_search_parent = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_folder_search_finalise;</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;user_flag = search_user_flag;</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'>-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'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_search_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSearch *search = (CamelFolderSearch *)obj;</div><div class='del'>-	if (search-&gt;sexp)</div><div class='del'>-		gtk_object_unref((GtkObject *)search-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	g_free(search-&gt;last_search);</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)(camel_folder_search_parent))-&gt;finalize((GtkObject *)obj);</div><div class='del'>-}</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", GTK_STRUCT_OFFSET(CamelFolderSearchClass, and), 2 },</div><div class='del'>-	{ "or", GTK_STRUCT_OFFSET(CamelFolderSearchClass, or), 2 },</div><div class='del'>-	{ "not", GTK_STRUCT_OFFSET(CamelFolderSearchClass, not), 2 },</div><div class='del'>-	{ "&lt;", GTK_STRUCT_OFFSET(CamelFolderSearchClass, lt), 2 },</div><div class='del'>-	{ "&gt;", GTK_STRUCT_OFFSET(CamelFolderSearchClass, gt), 2 },</div><div class='del'>-	{ "=", GTK_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 poarses, or should they not?? */</div><div class='del'>-	{ "match-all", GTK_STRUCT_OFFSET(CamelFolderSearchClass, match_all), 3 },</div><div class='del'>-	{ "body-contains", GTK_STRUCT_OFFSET(CamelFolderSearchClass, body_contains), 1 },</div><div class='del'>-	{ "header-contains", GTK_STRUCT_OFFSET(CamelFolderSearchClass, header_contains), 1 },</div><div class='del'>-	{ "user-flag", GTK_STRUCT_OFFSET(CamelFolderSearchClass, user_flag), 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 *)GTK_OBJECT(search)-&gt;klass;</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, gtk_type_name(GTK_OBJECT(search)-&gt;klass-&gt;type));</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 ( gtk_type_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'>-	search-&gt;summary = summary;</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 (ibex) 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, ibex *index)</div><div class='del'>-{</div><div class='del'>-	search-&gt;body_index = 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 a list of</div><div class='del'>- * all matches as a GList 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 a GPtrArray</div><div class='del'>- * of summary items instead (since they are much more useful</div><div class='del'>- * to any client).</div><div class='del'>- * </div><div class='del'>- * Return value: A GList of strings of all matching messages.  Once</div><div class='del'>- * finished with this, the array AND CONTENTS should be free'd</div><div class='del'>- * by the caller.</div><div class='del'>- **/</div><div class='del'>-GList *</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'>-	GList *matches = NULL;</div><div class='del'>-	int i;</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'>-		e_sexp_parse(search-&gt;sexp);</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'>-</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'>-		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'>-			matches = g_list_prepend(matches, g_strdup(g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(r);</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'>-	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'>-/* 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(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(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_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(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 (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'>-		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, search-&gt;current-&gt;uid);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("invalid syntax, matches require a single bool result");</div><div class='del'>-			}</div><div class='del'>-			e_sexp_result_free(r1);</div><div class='del'>-		} else {</div><div class='del'>-			g_ptr_array_add(r-&gt;value.ptrarray, search-&gt;current-&gt;uid);</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'>-search_header_contains(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 truth = FALSE;</div><div class='del'>-</div><div class='del'>-	r(printf("executing header-contains\n"));</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, *header = NULL;</div><div class='del'>-		char strbuf[32];</div><div class='del'>-		int i;</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 = search-&gt;current-&gt;subject;</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 = search-&gt;current-&gt;from;</div><div class='del'>-		} else if (!strcasecmp(headername, "to")) {</div><div class='del'>-			header = search-&gt;current-&gt;from;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("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'>-				    &amp;&amp; strstr(header, argv[i]-&gt;value.string)) {</div><div class='del'>-					r(printf("%s got a match with %s of %s\n", search-&gt;current-&gt;uid, header, 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'>-	}</div><div class='del'>-	/* TODO: else, find all matches */</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(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'>-/* 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'>-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'>-	ESExpResult *r;</div><div class='del'>-	int i, j;</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'>-		r = e_sexp_result_new(ESEXP_RES_BOOL);</div><div class='del'>-		if (search-&gt;body_index) {</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'>-					truth = ibex_find_name(search-&gt;body_index, search-&gt;current-&gt;uid, argv[i]-&gt;value.string);</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'>-		} else {</div><div class='del'>-			g_warning("Cannot perform indexed body query with no index");</div><div class='del'>-		}</div><div class='del'>-		r-&gt;value.bool = truth;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);</div><div class='del'>-</div><div class='del'>-		if (search-&gt;body_index) {</div><div class='del'>-			if (argc==1) {</div><div class='del'>-				/* common case */</div><div class='del'>-				r-&gt;value.ptrarray = ibex_find(search-&gt;body_index, argv[0]-&gt;value.string);</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 *pa;</div><div class='del'>-				struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-</div><div class='del'>-				/* this sux, perform an or operation on the result(s) of each word */</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'>-						pa = ibex_find(search-&gt;body_index, argv[i]-&gt;value.string);</div><div class='del'>-						for (j=0;j&lt;pa-&gt;len;j++) {</div><div class='del'>-							g_hash_table_insert(ht, g_ptr_array_index(pa, j), (void *)1);</div><div class='del'>-						}</div><div class='del'>-						g_ptr_array_free(pa, FALSE);</div><div class='del'>-					} else {</div><div class='del'>-						g_warning("invalid type passed to body-contains");</div><div class='del'>-					}</div><div class='del'>-				}</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;value.ptrarray = lambdafoo.uids;</div><div class='del'>-				g_hash_table_destroy(ht);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			r-&gt;value.ptrarray = g_ptr_array_new();</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 *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(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(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='head'>diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h<br/>deleted file mode 100644<br/>index 87493912f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-search.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder-search.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#ifndef _CAMEL_FOLDER_SEARCH_H</div><div class='del'>-#define _CAMEL_FOLDER_SEARCH_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_SEARCH(obj)         GTK_CHECK_CAST (obj, camel_folder_search_get_type (), CamelFolderSearch)</div><div class='del'>-#define CAMEL_FOLDER_SEARCH_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_folder_search_get_type (), CamelFolderSearchClass)</div><div class='del'>-#define IS_CAMEL_FOLDER_SEARCH(obj)      GTK_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'>-	CamelMessageInfo *current; /* current message info, when searching one by one */</div><div class='del'>-	ibex *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 _ESExpTerm **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'>-	/* (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'>-</div><div class='del'>-guint		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, ibex *index);</div><div class='del'>-GList *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);</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 dd99921924..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-summary.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1516 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;netinet/in.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-folder-summary.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</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-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-save.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-basic.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include "hash-table-utils.h"</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 (5)</div><div class='del'>-</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'>-	CamelMimeFilterIndex *filter_index;</div><div class='del'>-	CamelMimeFilterBasic *filter_64;</div><div class='del'>-	CamelMimeFilterBasic *filter_qp;</div><div class='del'>-	CamelMimeFilterSave *filter_save;</div><div class='del'>-</div><div class='del'>-	ibex *index;</div><div class='del'>-};</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_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_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 CamelMessageContentInfo * summary_build_content_info(CamelFolderSummary *s, CamelMimeParser *mp);</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_finalise   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_folder_summary_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_folder_summary_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'>-			"CamelFolderSummary",</div><div class='del'>-			sizeof (CamelFolderSummary),</div><div class='del'>-			sizeof (CamelFolderSummaryClass),</div><div class='del'>-			(GtkClassInitFunc) camel_folder_summary_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_folder_summary_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 (camel_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'>-camel_folder_summary_class_init (CamelFolderSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_folder_summary_parent = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_folder_summary_finalise;</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_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_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'>-	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'>-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;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'>-</div><div class='del'>-static void free_o_name(void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref((GtkObject *)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_finalise (GtkObject *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 (p-&gt;filter_index)</div><div class='del'>-		gtk_object_unref ((GtkObject *)p-&gt;filter_index);</div><div class='del'>-	if (p-&gt;filter_64)</div><div class='del'>-		gtk_object_unref ((GtkObject *)p-&gt;filter_64);</div><div class='del'>-	if (p-&gt;filter_qp)</div><div class='del'>-		gtk_object_unref ((GtkObject *)p-&gt;filter_qp);</div><div class='del'>-	if (p-&gt;filter_save)</div><div class='del'>-		gtk_object_unref ((GtkObject *)p-&gt;filter_save);</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)(camel_folder_summary_parent))-&gt;finalize((GtkObject *)obj);</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 ( gtk_type_new (camel_folder_summary_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_folder_summary_set_filename(CamelFolderSummary *s, const char *name)</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'>-</div><div class='del'>-void camel_folder_summary_set_index(CamelFolderSummary *s, ibex *index)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);</div><div class='del'>-</div><div class='del'>-	p-&gt;index = index;</div><div class='del'>-}</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'>-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'>-CamelMessageInfo *</div><div class='del'>-camel_folder_summary_index(CamelFolderSummary *s, int i)</div><div class='del'>-{</div><div class='del'>-	if (i&lt;s-&gt;messages-&gt;len)</div><div class='del'>-		return g_ptr_array_index(s-&gt;messages, i);</div><div class='del'>-	return NULL;</div><div class='del'>-}</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'>-	return g_hash_table_lookup(s-&gt;messages_uid, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 base)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;nextuid &lt;= base)</div><div class='del'>-		s-&gt;nextuid = base+1;</div><div class='del'>-}</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 = s-&gt;nextuid++;</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'>-/* 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 *)((GtkObject *)s)-&gt;klass)-&gt;content_info_load(s, in);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;count);</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'>-		}</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'>-	printf("loading summary\n");</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'>-</div><div class='del'>-	printf("loading header\n");</div><div class='del'>-</div><div class='del'>-	if ( ((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;summary_header_load(s, in) == -1) {</div><div class='del'>-		fclose(in);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("loading content\n");</div><div class='del'>-</div><div class='del'>-	/* now read in each message ... */</div><div class='del'>-	/* FIXME: check returns */</div><div class='del'>-	for (i=0;i&lt;s-&gt;saved_count;i++) {</div><div class='del'>-		mi = ((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;message_info_load(s, in);</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'>-		}</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'>-	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'>-</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 *)((GtkObject *)s)-&gt;klass)-&gt;content_info_save(s, out, ci);</div><div class='del'>-	camel_folder_summary_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'>-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'>-	printf("saving summary? '%s'\n", 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'>-		printf("nup\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("yep\n");</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'>-	if ( ((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;summary_header_save(s, out) == -1) {</div><div class='del'>-		fclose(out);</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'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		mi = camel_folder_summary_index(s, i);</div><div class='del'>-		((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&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'>-	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'>-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'>-retry:</div><div class='del'>-	if (info-&gt;uid == NULL) {</div><div class='del'>-		info-&gt;uid = g_strdup_printf("%u", s-&gt;nextuid++);</div><div class='del'>-	}</div><div class='del'>-	if (g_hash_table_lookup(s-&gt;messages_uid, info-&gt;uid)) {</div><div class='del'>-		g_warning("Trying to insert message with clashing uid.  new uid re-assigned");</div><div class='del'>-		g_free(info-&gt;uid);</div><div class='del'>-		info-&gt;uid = NULL;</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		goto retry;</div><div class='del'>-	}</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, info-&gt;uid, info);</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-}</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 = NULL;</div><div class='del'>-</div><div class='del'>-	info = ((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;message_info_new(s, h);</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'>-CamelMessageInfo *camel_folder_summary_add_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'>-</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'>-	if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_EOF) {</div><div class='del'>-		info = ((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&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'>-		/* FIXME: better uid assignment method? */</div><div class='del'>-		if (info-&gt;uid == NULL) {</div><div class='del'>-			info-&gt;uid = g_strdup_printf("%u", s-&gt;nextuid++);</div><div class='del'>-		}</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_ibex(p-&gt;index);</div><div class='del'>-			camel_mime_filter_index_set_name(p-&gt;filter_index, info-&gt;uid);</div><div class='del'>-			ibex_unindex(p-&gt;index, info-&gt;uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* build the content info, if we're supposed to */</div><div class='del'>-		if (s-&gt;build_content) {</div><div class='del'>-			info-&gt;content = summary_build_content_info(s, mp);</div><div class='del'>-			if (info-&gt;content-&gt;pos != -1)</div><div class='del'>-				info-&gt;size = info-&gt;content-&gt;endpos - info-&gt;content-&gt;pos;</div><div class='del'>-		} else {</div><div class='del'>-			camel_mime_parser_drop_step(mp);</div><div class='del'>-		}</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'>-static void</div><div class='del'>-perform_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 *)((GtkObject *)s)-&gt;klass)-&gt;content_info_free(s, ci);</div><div class='del'>-	while (pw) {</div><div class='del'>-		pn = pw-&gt;next;</div><div class='del'>-		perform_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'>-void</div><div class='del'>-camel_folder_summary_touch(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-}</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'>-	if (camel_folder_summary_count(s) == 0)</div><div class='del'>-		return;</div><div class='del'>-</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'>-		CamelMessageContentInfo *ci = mi-&gt;content;</div><div class='del'>-</div><div class='del'>-		((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;message_info_free(s, mi);		</div><div class='del'>-		if (s-&gt;build_content &amp;&amp; ci) {</div><div class='del'>-			perform_content_info_free(s, ci);</div><div class='del'>-		}</div><div class='del'>-	}</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'>-}</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'>-	CamelMessageContentInfo *ci = info-&gt;content;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove(s-&gt;messages_uid, info-&gt;uid);</div><div class='del'>-	g_ptr_array_remove(s-&gt;messages, info);</div><div class='del'>-	((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;message_info_free(s, info);</div><div class='del'>-	if (s-&gt;build_content &amp;&amp; ci) {</div><div class='del'>-		perform_content_info_free(s, ci);</div><div class='del'>-	}</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-}</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'>-        if (g_hash_table_lookup_extended(s-&gt;messages_uid, uid, (void *)&amp;olduid, (void *)&amp;oldinfo)) {</div><div class='del'>-		camel_folder_summary_remove(s, oldinfo);</div><div class='del'>-		g_free(olduid);</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_encode_uint32(FILE *out, guint32 value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	io(printf("Encoding int %u\n", value));</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'>-int</div><div class='del'>-camel_folder_summary_decode_uint32(FILE *in, guint32 *dest)</div><div class='del'>-{</div><div class='del'>-        gint32 value=0, 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 01;</div><div class='del'>-	}</div><div class='del'>-	*dest = value | (v&amp;0x7f);</div><div class='del'>-</div><div class='del'>-	io(printf("Decoding int %u\n", *dest));</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_folder_summary_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'>-int</div><div class='del'>-camel_folder_summary_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'>-/* 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'>-int</div><div class='del'>-camel_folder_summary_encode_token(FILE *out, 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_folder_summary_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 (*)(void *, 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_folder_summary_encode_uint32(out, token+1);</div><div class='del'>-		} else {</div><div class='del'>-			if (camel_folder_summary_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'>-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'>-	int len;</div><div class='del'>-</div><div class='del'>-	io(printf("Decode token ...\n"));</div><div class='del'>-	</div><div class='del'>-	if (camel_folder_summary_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'>-int</div><div class='del'>-camel_folder_summary_encode_string(FILE *out, char *str)</div><div class='del'>-{</div><div class='del'>-	register int len;</div><div class='del'>-</div><div class='del'>-	io(printf("Encoding string: '%s'\n", str));</div><div class='del'>-</div><div class='del'>-	if (str == NULL)</div><div class='del'>-		return camel_folder_summary_encode_uint32(out, 0);</div><div class='del'>-</div><div class='del'>-	len = strlen(str);</div><div class='del'>-	if (camel_folder_summary_encode_uint32(out, len+1) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	if (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'>-int</div><div class='del'>-camel_folder_summary_decode_string(FILE *in, char **str)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-	register char *ret;</div><div class='del'>-</div><div class='del'>-	io(printf("Decode string ...\n", str));</div><div class='del'>-</div><div class='del'>-	if (camel_folder_summary_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 &lt; 0) {</div><div class='del'>-		*str = NULL;</div><div class='del'>-		io(printf("String = '%s'\n", *str));</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 (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'>-	io(printf("String = '%s'\n", ret));</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'>-void</div><div class='del'>-camel_folder_summary_offset_content(CamelMessageContentInfo *content, off_t offset)</div><div class='del'>-{</div><div class='del'>-	content-&gt;pos += offset;</div><div class='del'>-	content-&gt;bodypos += offset;</div><div class='del'>-	content-&gt;endpos += offset;</div><div class='del'>-	content = content-&gt;childs;</div><div class='del'>-	while (content) {</div><div class='del'>-		camel_folder_summary_offset_content(content, offset);</div><div class='del'>-		content = content-&gt;next;</div><div class='del'>-	}</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'>-	guint32 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_folder_summary_decode_fixed_int32(in, &amp;version) == -1</div><div class='del'>-	    || camel_folder_summary_decode_fixed_int32(in, &amp;flags) == -1</div><div class='del'>-	    || camel_folder_summary_decode_fixed_int32(in, &amp;nextuid) == -1</div><div class='del'>-	    || camel_folder_summary_decode_fixed_int32(in, &amp;time) == -1	/* TODO: yes i know this warns, to be fixed later */</div><div class='del'>-	    || camel_folder_summary_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_folder_summary_encode_fixed_int32(out, s-&gt;version);</div><div class='del'>-	camel_folder_summary_encode_fixed_int32(out, s-&gt;flags);</div><div class='del'>-	camel_folder_summary_encode_fixed_int32(out, s-&gt;nextuid);</div><div class='del'>-	camel_folder_summary_encode_fixed_int32(out, s-&gt;time);</div><div class='del'>-	return camel_folder_summary_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 *)((GtkObject *)s)-&gt;klass)-&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 *)((GtkObject *)s)-&gt;klass)-&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 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'>-	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)</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(*text))</div><div class='del'>-			text++;</div><div class='del'>-		return header_decode_string(text);</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 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'>-	char *received;</div><div class='del'>-</div><div class='del'>-	mi = g_malloc0(s-&gt;message_info_size);</div><div class='del'>-</div><div class='del'>-	mi-&gt;subject = summary_format_string(h, "subject");</div><div class='del'>-	mi-&gt;from = summary_format_address(h, "from");</div><div class='del'>-	mi-&gt;to = summary_format_address(h, "to");</div><div class='del'>-	mi-&gt;user_flags = 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'>-	mi-&gt;message_id = header_msgid_decode(header_raw_find(&amp;h, "message-id", NULL));</div><div class='del'>-	/* if we have a references, use that, otherwise, see if we have an in-reply-to</div><div class='del'>-	   header, with parsable content, otherwise *shrug* */</div><div class='del'>-	mi-&gt;references = header_references_decode(header_raw_find(&amp;h, "references", NULL));</div><div class='del'>-	if (mi-&gt;references == NULL) {</div><div class='del'>-		char *id;</div><div class='del'>-		id = header_msgid_decode(header_raw_find(&amp;h, "in-reply-to", NULL));</div><div class='del'>-		if (id)</div><div class='del'>-			header_references_list_append_asis(&amp;mi-&gt;references, id);</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'>-</div><div class='del'>-	mi = g_malloc0(s-&gt;message_info_size);</div><div class='del'>-</div><div class='del'>-	io(printf("Loading message info\n"));</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_decode_string(in, &amp;mi-&gt;uid);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;mi-&gt;flags);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;mi-&gt;date_sent);	/* warnings, leave them here */</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;mi-&gt;date_received);</div><div class='del'>-/*	ms-&gt;xev_offset = camel_folder_summary_decode_uint32(in);*/</div><div class='del'>-	camel_folder_summary_decode_string(in, &amp;mi-&gt;subject);</div><div class='del'>-	camel_folder_summary_decode_string(in, &amp;mi-&gt;from);</div><div class='del'>-	camel_folder_summary_decode_string(in, &amp;mi-&gt;to);</div><div class='del'>-	mi-&gt;content = NULL;</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_decode_string(in, &amp;mi-&gt;message_id);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;count);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		char *id;</div><div class='del'>-		camel_folder_summary_decode_string(in, &amp;id);</div><div class='del'>-		header_references_list_append_asis(&amp;mi-&gt;references, id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;count);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		char *name;</div><div class='del'>-		camel_folder_summary_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'>-	return mi;</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'>-	struct _header_references *refs;</div><div class='del'>-</div><div class='del'>-	io(printf("Saving message info\n"));</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_encode_string(out, mi-&gt;uid);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, mi-&gt;flags);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, mi-&gt;date_sent);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, mi-&gt;date_received);</div><div class='del'>-/*	camel_folder_summary_encode_uint32(out, ms-&gt;xev_offset);*/</div><div class='del'>-	camel_folder_summary_encode_string(out, mi-&gt;subject);</div><div class='del'>-	camel_folder_summary_encode_string(out, mi-&gt;from);</div><div class='del'>-	camel_folder_summary_encode_string(out, mi-&gt;to);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_encode_string(out, mi-&gt;message_id);</div><div class='del'>-</div><div class='del'>-	count = header_references_list_size(&amp;mi-&gt;references);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, count);</div><div class='del'>-	refs = mi-&gt;references;</div><div class='del'>-	while (refs) {</div><div class='del'>-		camel_folder_summary_encode_string(out, refs-&gt;id);</div><div class='del'>-		refs = refs-&gt;next;</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_folder_summary_encode_uint32(out, count);</div><div class='del'>-	flag = mi-&gt;user_flags;</div><div class='del'>-	while (flag) {</div><div class='del'>-		camel_folder_summary_encode_string(out, flag-&gt;name);</div><div class='del'>-		flag = flag-&gt;next;</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'>-	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;message_id);</div><div class='del'>-	header_references_list_clear(&amp;mi-&gt;references);</div><div class='del'>-	camel_flag_list_free(&amp;mi-&gt;user_flags);</div><div class='del'>-	g_free(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'>-</div><div class='del'>-	ci = g_malloc0(s-&gt;content_info_size);</div><div class='del'>-</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));</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'>-	ci-&gt;pos = -1;</div><div class='del'>-	ci-&gt;bodypos = -1;</div><div class='del'>-	ci-&gt;endpos = -1;</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 = g_malloc0(s-&gt;content_info_size);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;ci-&gt;pos);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;ci-&gt;bodypos);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;ci-&gt;endpos);</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'>-	camel_folder_summary_decode_uint32(in, &amp;count);</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'>-		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'>-	ci-&gt;childs = NULL;</div><div class='del'>-	return ci;</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'>-	camel_folder_summary_encode_uint32(out, ci-&gt;pos);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, ci-&gt;bodypos);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, ci-&gt;endpos);</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_folder_summary_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_folder_summary_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'>-	return camel_folder_summary_encode_token(out, ci-&gt;encoding);</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'>-	g_free(ci);</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'>-static CamelMessageContentInfo *</div><div class='del'>-summary_build_content_info(CamelFolderSummary *s, 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, 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'>-	info = ((CamelFolderSummaryClass *)((GtkObject *)s)-&gt;klass)-&gt;content_info_new_from_parser(s, mp);</div><div class='del'>-</div><div class='del'>-	info-&gt;pos = camel_mime_parser_tell_start_headers(mp);</div><div class='del'>-	info-&gt;bodypos = body;</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'>-		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'>-					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'>-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p-&gt;filter_qp);</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, "iso-8859-1")==0)) {</div><div class='del'>-				d(printf(" Adding conversion filter from %s to iso-8859-1\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, "iso-8859-1");</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'>-				}</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 'iso-8859-1', message index may be corrupt", charset);</div><div class='del'>-				}</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, 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'>-		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, 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'>-			} else {</div><div class='del'>-				g_error("Parsing failed: could not build part of a multipart");</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'>-		part = summary_build_content_info(s, 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'>-		} else {</div><div class='del'>-			g_error("Parsing failed: no content of a message?");</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'>-	info-&gt;endpos = camel_mime_parser_tell(mp);</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'>-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'>-void</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;</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'>-}</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'>-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'>-#if 0</div><div class='del'>-static void</div><div class='del'>-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("%sconent-type: %s/%s\n", p, ci-&gt;type-&gt;type, ci-&gt;type-&gt;subtype);</div><div class='del'>-	printf("%sontent-transfer-encoding: %s\n", p, ci-&gt;encoding);</div><div class='del'>-	printf("%scontent-description: %s\n", p, ci-&gt;description);</div><div class='del'>-	printf("%sbytes: %d %d %d\n", p, (int)ci-&gt;pos, (int)ci-&gt;bodypos, (int)ci-&gt;endpos);</div><div class='del'>-	ci = ci-&gt;childs;</div><div class='del'>-	while (ci) {</div><div class='del'>-		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'>-static void</div><div class='del'>-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", mi-&gt;subject);</div><div class='del'>-	printf("To: %s\n", mi-&gt;to);</div><div class='del'>-	printf("From: %s\n", mi-&gt;from);</div><div class='del'>-	printf("UID: %s\n", mi-&gt;uid);</div><div class='del'>-	printf("Flags: %04x\n", mi-&gt;flags &amp; 0xffff);</div><div class='del'>-	content_info_dump(mi-&gt;content, 0);</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'>-	CamelMimeParser *mp;</div><div class='del'>-	int fd;</div><div class='del'>-	CamelFolderSummary *s;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int len;</div><div class='del'>-	int i;</div><div class='del'>-	ibex *index;</div><div class='del'>-</div><div class='del'>-	gtk_init(&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-		char *s;</div><div class='del'>-		char buf[1024];</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;434712;i++) {</div><div class='del'>-			memcpy(buf, "                                                         ", 50);</div><div class='del'>-			buf[50] = 0;</div><div class='del'>-#if 0</div><div class='del'>-			s = g_strdup(buf);</div><div class='del'>-			g_free(s);</div><div class='del'>-#endif</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 (argc &lt; 2 ) {</div><div class='del'>-		printf("usage: %s mbox\n", argv[0]);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fd = open(argv[1], O_RDONLY);</div><div class='del'>-</div><div class='del'>-	index = ibex_open("index.ibex", O_CREAT|O_RDWR, 0600);</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_set_header_regex(mp, "^(content-[^:]*|subject|from|to|date):");*/</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-</div><div class='del'>-	s = camel_folder_summary_new();</div><div class='del'>-	camel_folder_summary_set_build_content(s, TRUE);</div><div class='del'>-/*	camel_folder_summary_set_index(s, index);*/</div><div class='del'>-</div><div class='del'>-	while (camel_mime_parser_step(mp, &amp;buffer, &amp;len) == HSCAN_FROM) {</div><div class='del'>-		/*printf("Parsing message ...\n");*/</div><div class='del'>-		camel_folder_summary_add_from_parser(s, mp);</div><div class='del'>-		if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_FROM_END) {</div><div class='del'>-			g_warning("Uknown state encountered, excpecting %d, got %d\n", HSCAN_FROM_END, camel_mime_parser_state(mp));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Printing summary\n");</div><div class='del'>-	for (i=0;i&lt;camel_folder_summary_count(s);i++) {</div><div class='del'>-		message_info_dump(camel_folder_summary_index(s, i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Saivng summary\n");</div><div class='del'>-	camel_folder_summary_set_filename(s, "index.summary");</div><div class='del'>-	camel_folder_summary_save(s);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		CamelFolderSummary *n;</div><div class='del'>-</div><div class='del'>-		printf("\nLoading summary\n");</div><div class='del'>-		n = camel_folder_summary_new();</div><div class='del'>-		camel_folder_summary_set_build_content(n, TRUE);</div><div class='del'>-		camel_folder_summary_set_filename(n, "index.summary");</div><div class='del'>-		camel_folder_summary_load(n);</div><div class='del'>-</div><div class='del'>-		printf("Printing summary\n");</div><div class='del'>-		for (i=0;i&lt;camel_folder_summary_count(n);i++) {</div><div class='del'>-			message_info_dump(camel_folder_summary_index(n, i));</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(n);		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(mp);</div><div class='del'>-	gtk_object_unref(s);</div><div class='del'>-</div><div class='del'>-	printf("summarised %d messages\n", camel_folder_summary_count(s));</div><div class='del'>-#if 0</div><div class='del'>-	printf("g_strdup count = %d\n", strdup_count);</div><div class='del'>-	printf("g_malloc count = %d\n", malloc_count);</div><div class='del'>-	printf("g_free count = %d\n", free_count);</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-folder-summary.h b/camel/camel-folder-summary.h<br/>deleted file mode 100644<br/>index 46ae856ee6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-summary.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,216 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#ifndef _CAMEL_FOLDER_SUMMARY_H</div><div class='del'>-#define _CAMEL_FOLDER_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.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;camel/camel-mime-parser.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_SUMMARY(obj)         GTK_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary)</div><div class='del'>-#define CAMEL_FOLDER_SUMMARY_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_folder_summary_get_type (), CamelFolderSummaryClass)</div><div class='del'>-#define IS_CAMEL_FOLDER_SUMMARY(obj)      GTK_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'>-/* these structs from camel-folder-summary.h ... (remove comment after cleanup soon) */</div><div class='del'>-/* TODO: perhaps they should be full-block objects? */</div><div class='del'>-/* FIXME: rename this to something more suitable */</div><div class='del'>-typedef struct {</div><div class='del'>-	gchar *name;</div><div class='del'>-	gint nb_message;	/* ick, these should be renamed to something better */</div><div class='del'>-	gint nb_unread_message;</div><div class='del'>-	gint nb_deleted_message;</div><div class='del'>-} CamelFolderInfo;</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'>-typedef 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'>-</div><div class='del'>-	/* information about where this object lives in the stream.</div><div class='del'>-	   if pos is -1 these are all invalid */</div><div class='del'>-	off_t pos;</div><div class='del'>-	off_t bodypos;</div><div class='del'>-	off_t endpos;</div><div class='del'>-} CamelMessageContentInfo;</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'>-	/* 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];</div><div class='del'>-} CamelFlag;</div><div class='del'>-</div><div class='del'>-/* information about a given object */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* public fields */</div><div class='del'>-	gchar *subject;</div><div class='del'>-	gchar *to;</div><div class='del'>-	gchar *from;</div><div class='del'>-</div><div class='del'>-	gchar *uid;</div><div class='del'>-	guint32 flags;</div><div class='del'>-	guint32 size;</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'>-	/* Message-ID / References structures */</div><div class='del'>-	char *message_id;	/* for this message */</div><div class='del'>-	struct _header_references *references; /* from parent to root */</div><div class='del'>-</div><div class='del'>-	struct _CamelFlag *user_flags;</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'>-} CamelMessageInfo;</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'>-	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_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_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'>-</div><div class='del'>-guint			 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 *, ibex *);</div><div class='del'>-void camel_folder_summary_set_uid(CamelFolderSummary *, guint32);</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'>-</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'>-/* 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'>-</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'>-/* 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'>-</div><div class='del'>-/* shift content ... */</div><div class='del'>-void camel_folder_summary_offset_content(CamelMessageContentInfo *content, off_t offset);</div><div class='del'>-</div><div class='del'>-/* summary file loading/saving helper functions */</div><div class='del'>-int camel_folder_summary_encode_fixed_int32(FILE *, gint32);</div><div class='del'>-int camel_folder_summary_decode_fixed_int32(FILE *, gint32 *);</div><div class='del'>-</div><div class='del'>-int camel_folder_summary_encode_uint32(FILE *, guint32);</div><div class='del'>-int camel_folder_summary_decode_uint32(FILE *, guint32 *);</div><div class='del'>-</div><div class='del'>-int camel_folder_summary_encode_string(FILE *, char *);</div><div class='del'>-int camel_folder_summary_decode_string(FILE *, char **);</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 *, 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'>-void		camel_flag_set(CamelFlag **list, const char *name, gboolean state);</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'>-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */</div><div class='head'>diff --git a/camel/camel-folder.c b/camel/camel-folder.c<br/>deleted file mode 100644<br/>index f3cea51af2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1015 +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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</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'>-</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) CAMEL_FOLDER_CLASS (GTK_OBJECT (so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</div><div class='del'>-	FOLDER_CHANGED,</div><div class='del'>-	MESSAGE_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 init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-		  CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		  gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-		  CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void finalize (GtkObject *object);</div><div class='del'>-</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'>-</div><div class='del'>-</div><div class='del'>-static gboolean can_hold_folders (CamelFolder *folder);</div><div class='del'>-static gboolean can_hold_messages (CamelFolder *folder);</div><div class='del'>-static guint32 get_permanent_flags (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static guint32 get_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-static void set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-			       guint32 flags, guint32 set, CamelException *ex);</div><div class='del'>-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				       const char *name, CamelException *ex);</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'>-				   CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray *get_subfolder_names (CamelFolder *folder,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-static CamelFolder *get_subfolder     (CamelFolder *folder,</div><div class='del'>-				       const gchar *folder_name,</div><div class='del'>-				       gboolean create,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-static CamelFolder *get_parent_folder (CamelFolder *folder,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-static CamelStore *get_parent_store   (CamelFolder *folder,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</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'>-			    CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray        *get_uids            (CamelFolder *folder,</div><div class='del'>-					      CamelException *ex);</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'>-					      CamelException *ex);</div><div class='del'>-static void              free_summary        (CamelFolder *folder,</div><div class='del'>-					      GPtrArray *array);</div><div class='del'>-static const gchar      *get_message_uid     (CamelFolder *folder,</div><div class='del'>-					      CamelMimeMessage *message,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-static CamelMimeMessage *get_message_by_uid  (CamelFolder *folder,</div><div class='del'>-					      const gchar *uid,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-static void delete_message_by_uid            (CamelFolder *folder,</div><div class='del'>-					      const gchar *uid,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *summary_get_by_uid (CamelFolder *folder,</div><div class='del'>-						   const char *uid);</div><div class='del'>-</div><div class='del'>-static GList *search_by_expression (CamelFolder *folder, const char *exp,</div><div class='del'>-				    CamelException *ex);</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_folder_class-&gt;init = init;</div><div class='del'>-	camel_folder_class-&gt;sync = folder_sync;</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;can_hold_folders = can_hold_folders;</div><div class='del'>-	camel_folder_class-&gt;can_hold_messages = can_hold_messages;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder = get_subfolder;</div><div class='del'>-	camel_folder_class-&gt;get_parent_folder = get_parent_folder;</div><div class='del'>-	camel_folder_class-&gt;get_parent_store = get_parent_store;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder_names = get_subfolder_names;</div><div class='del'>-	camel_folder_class-&gt;free_subfolder_names = free_uids;</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;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_uid = get_message_uid;</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;delete_message_by_uid = delete_message_by_uid;</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;summary_get_by_uid = summary_get_by_uid;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-</div><div class='del'>-        signals[FOLDER_CHANGED] =</div><div class='del'>-                gtk_signal_new ("folder_changed",</div><div class='del'>-                                GTK_RUN_LAST,</div><div class='del'>-                                gtk_object_class-&gt;type,</div><div class='del'>-                                GTK_SIGNAL_OFFSET (CamelFolderClass,</div><div class='del'>-						   folder_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'>-        signals[MESSAGE_CHANGED] =</div><div class='del'>-                gtk_signal_new ("message_changed",</div><div class='del'>-                                GTK_RUN_LAST,</div><div class='del'>-                                gtk_object_class-&gt;type,</div><div class='del'>-                                GTK_SIGNAL_OFFSET (CamelFolderClass,</div><div class='del'>-						   message_changed),</div><div class='del'>-                                gtk_marshal_NONE__STRING,</div><div class='del'>-                                GTK_TYPE_NONE, 1, GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-        gtk_object_class_add_signals (gtk_object_class, signals, LAST_SIGNAL);</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'>-camel_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_folder_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_folder_type)	{</div><div class='del'>-		GtkTypeInfo camel_folder_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelFolder",</div><div class='del'>-			sizeof (CamelFolder),</div><div class='del'>-			sizeof (CamelFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_folder_type = gtk_type_unique (camel_object_get_type (),</div><div class='del'>-						     &amp;camel_folder_info);</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'>-static void</div><div class='del'>-finalize (GtkObject *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'>-		gtk_object_unref (GTK_OBJECT (camel_folder-&gt;parent_store));</div><div class='del'>-	if (camel_folder-&gt;parent_folder)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (camel_folder-&gt;parent_folder));</div><div class='del'>-</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'>-/**</div><div class='del'>- * init: init the folder</div><div class='del'>- * @folder: folder object to initialize</div><div class='del'>- * @parent_store: parent store object of the folder</div><div class='del'>- * @parent_folder: parent folder of the folder (may be NULL)</div><div class='del'>- * @name: (short) name of the folder</div><div class='del'>- * @separator: separator between the parent folder name and this name</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Initalizes the folder by setting the parent store, parent folder,</div><div class='del'>- * and name.</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-      CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-      gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gchar *full_name;</div><div class='del'>-	const gchar *parent_full_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 (parent_folder == NULL || CAMEL_IS_FOLDER (parent_folder));</div><div class='del'>-	g_return_if_fail (folder-&gt;parent_store == NULL);</div><div class='del'>-</div><div class='del'>-	folder-&gt;parent_store = parent_store;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (parent_store));</div><div class='del'>-</div><div class='del'>-	folder-&gt;parent_folder = parent_folder;</div><div class='del'>-	if (parent_folder)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (parent_folder));</div><div class='del'>-</div><div class='del'>-	folder-&gt;separator = separator;</div><div class='del'>-	folder-&gt;path_begins_with_sep = path_begins_with_sep;</div><div class='del'>-</div><div class='del'>-	/* if the folder already has a name, free it */</div><div class='del'>-	g_free (folder-&gt;name);</div><div class='del'>-	g_free (folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	/* set those fields to NULL now, so that if an</div><div class='del'>-	   exception occurs, they will be set anyway */</div><div class='del'>-	folder-&gt;name = NULL;</div><div class='del'>-	folder-&gt;full_name = NULL;</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;parent_folder) {</div><div class='del'>-		parent_full_name =</div><div class='del'>-			camel_folder_get_full_name (folder-&gt;parent_folder);</div><div class='del'>-</div><div class='del'>-		full_name = g_strdup_printf ("%s%s%s", parent_full_name,</div><div class='del'>-					     folder-&gt;separator, name);</div><div class='del'>-	} else {</div><div class='del'>-		if (path_begins_with_sep)</div><div class='del'>-			full_name = g_strdup_printf ("%s%s", folder-&gt;separator, name);</div><div class='del'>-		else</div><div class='del'>-			full_name = g_strdup (name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	folder-&gt;name = g_strdup (name);</div><div class='del'>-	folder-&gt;full_name = 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'>-	g_warning ("CamelFolder::sync not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_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,</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'>-	CF_CLASS (folder)-&gt;sync (folder, expunge, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const gchar *</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 gchar *</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 gchar *</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 gchar *</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 gboolean</div><div class='del'>-can_hold_folders (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;can_hold_folders;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-can_hold_messages (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;can_hold_messages;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_subfolder (CamelFolder *folder, const gchar *folder_name,</div><div class='del'>-	       gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-	gchar *full_name;</div><div class='del'>-	const gchar *current_folder_full_name;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STORE (folder-&gt;parent_store), NULL);</div><div class='del'>-</div><div class='del'>-	current_folder_full_name = camel_folder_get_full_name (folder);</div><div class='del'>-</div><div class='del'>-	full_name = g_strdup_printf ("%s%s%s", current_folder_full_name,</div><div class='del'>-				     folder-&gt;separator, folder_name);</div><div class='del'>-	new_folder = camel_store_get_folder (folder-&gt;parent_store,</div><div class='del'>-					     full_name, create, ex);</div><div class='del'>-	g_free (full_name);</div><div class='del'>-</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_subfolder:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @folder_name: subfolder path</div><div class='del'>- * @create: whether or not to create the folder if it doesn't exist</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This method returns a folder object. This folder is a subfolder of</div><div class='del'>- * the given folder. It is an error to ask for a folder whose name begins</div><div class='del'>- * with the folder separator character.</div><div class='del'>- *</div><div class='del'>- * Return value: the requested folder, or %NULL if the subfolder object</div><div class='del'>- * could not be obtained</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_folder_get_subfolder (CamelFolder *folder, const gchar *folder_name,</div><div class='del'>-			    gboolean create, CamelException *ex)</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_name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_subfolder (folder, folder_name,</div><div class='del'>-						 create, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_parent_folder (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;parent_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_parent_folder:</div><div class='del'>- * @folder: folder to get the parent of</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: the folder's parent</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_folder_get_parent_folder (CamelFolder *folder, CamelException *ex)</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_folder (folder, ex);</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, CamelException *ex)</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'>- * @ex: a CamelException</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, CamelException *ex)</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, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_subfolder_names (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_subfolder_names not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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_subfolder_names:</div><div class='del'>- * @folder: the folder</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: an array containing the names of the folder's</div><div class='del'>- * subfolders. The array should not be modified and must be freed with</div><div class='del'>- * camel_folder_free_subfolder_names().</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_get_subfolder_names (CamelFolder *folder, CamelException *ex)</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_subfolder_names (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_subfolder_names:</div><div class='del'>- * @folder: folder object</div><div class='del'>- * @array: the array of subfolder names to free</div><div class='del'>- *</div><div class='del'>- * Frees the array of names returned by camel_folder_get_subfolder_names().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_subfolder_names (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_subfolder_names (folder, array);</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'>-	g_warning ("CamelFolder::expunge not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_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'>-	return CF_CLASS (folder)-&gt;expunge (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_count not implemented "</div><div class='del'>-		   "for `%s'", gtk_type_name (GTK_OBJECT_TYPE (folder)));</div><div class='del'>-	return -1;</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'>- * @ex: a CamelException</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'>-gint</div><div class='del'>-camel_folder_get_message_count (CamelFolder *folder, CamelException *ex)</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'>-	return CF_CLASS (folder)-&gt;get_message_count (folder, ex);</div><div class='del'>-}</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'>-		CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::append_message not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Add a message to a folder.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_append_message (CamelFolder *folder,</div><div class='del'>-			     CamelMimeMessage *message,</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'>-	CF_CLASS (folder)-&gt;append_message (folder, message, ex);</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, CamelException *ex)</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'>- * @ex: a CamelException</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, CamelException *ex)</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, ex);</div><div class='del'>-}</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, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_flags not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</div><div class='del'>-	return 0;</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'>- * @ex: a CamelException</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'>-				CamelException *ex)</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_message_flags (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'>-set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-		     guint32 flags, guint32 set, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::set_message_flags not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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'>- * @ex: a CamelException</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'>-				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'>-	CF_CLASS (folder)-&gt;set_message_flags (folder, uid, flags, set, ex);</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,</div><div class='del'>-		       const char *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_user_flag not implemented "</div><div class='del'>-		   "for `%s'", gtk_type_name (GTK_OBJECT_TYPE (folder)));</div><div class='del'>-	return FALSE;</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'>- * @ex: a CamelException</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, CamelException *ex)</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_message_user_flag (folder, uid,</div><div class='del'>-							 name, ex);</div><div class='del'>-}</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,</div><div class='del'>-		       const char *name, gboolean value, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::set_message_user_flag not implemented "</div><div class='del'>-		   "for `%s'", gtk_type_name (GTK_OBJECT_TYPE (folder)));</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'>- * @ex: a CamelException</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'>-				    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'>-	CF_CLASS (folder)-&gt;set_message_user_flag (folder, uid, name,</div><div class='del'>-						  value, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *</div><div class='del'>-summary_get_by_uid (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::summary_get_by_uid not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_get_by_uid:</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'>- * Return value: the summary information for the indicated message</div><div class='del'>- **/</div><div class='del'>-const CamelMessageInfo *</div><div class='del'>-camel_folder_summary_get_by_uid (CamelFolder *folder, const char *uid)</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'>-	return CF_CLASS (folder)-&gt;summary_get_by_uid (folder, uid);</div><div class='del'>-}</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;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 const gchar *</div><div class='del'>-get_message_uid (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_uid not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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_uid:</div><div class='del'>- * @folder: Folder in which the UID must refer to</div><div class='del'>- * @message: Message object</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return the UID of a message relatively to a folder.</div><div class='del'>- * A message can have different UID, each one corresponding</div><div class='del'>- * to a different folder, if the message is referenced in</div><div class='del'>- * several folders.</div><div class='del'>- *</div><div class='del'>- * Return value: The UID of the message in the folder</div><div class='del'>- **/</div><div class='del'>-const gchar *</div><div class='del'>-camel_folder_get_message_uid (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-			      CamelException *ex)</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 (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_message_uid (folder, message, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_by_uid not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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_by_uid:</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_by_uid (CamelFolder *folder, const gchar *uid,</div><div class='del'>-				 CamelException *ex)</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_message_by_uid (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'>-delete_message_by_uid (CamelFolder *folder, const gchar *uid,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::delete_message_by_uid not implemented "</div><div class='del'>-		   "for `%s'", gtk_type_name (GTK_OBJECT_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_delete_message_by_uid:</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'>- * Delete a message from a folder given its UID.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_delete_message_by_uid (CamelFolder *folder, const gchar *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'>-	return CF_CLASS (folder)-&gt;delete_message_by_uid (folder, uid, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_uids (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_uids not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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_uids:</div><div class='del'>- * @folder: folder object</div><div class='del'>- * @ex: a CamelException</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, CamelException *ex)</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_uids (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is also the default implementation of free_subfolder_names. */</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'>-	/* Default implementation: free all of the strings and</div><div class='del'>-	 * the array itself.</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'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_summary (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_summary not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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_summary:</div><div class='del'>- * @folder: a folder object</div><div class='del'>- * @ex: a CamelException</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, CamelException *ex)</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_summary (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_summary (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::free_summary not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));</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</div><div class='del'>-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'>-/**</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;has_search_capability;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</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'>-	g_warning ("CamelFolder::search_by_expression not implemented for "</div><div class='del'>-		   "`%s'", gtk_type_name (GTK_OBJECT_TYPE (folder)));</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'>-GList *</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'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-	g_return_val_if_fail (folder-&gt;has_search_capability, NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;search_by_expression (folder, expression, ex);</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 9e9acc6afd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +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.h: 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;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)     (GTK_CHECK_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))</div><div class='del'>-#define CAMEL_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))</div><div class='del'>-#define CAMEL_IS_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))</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'>-	gchar *name;</div><div class='del'>-	gchar *full_name;</div><div class='del'>-	gchar *separator;</div><div class='del'>-	CamelStore *parent_store;</div><div class='del'>-	CamelFolder *parent_folder;</div><div class='del'>-	guint32 permanent_flags;</div><div class='del'>-</div><div class='del'>-	gboolean path_begins_with_sep;</div><div class='del'>-	</div><div class='del'>-	gboolean can_hold_folders:1;</div><div class='del'>-	gboolean can_hold_messages:1;</div><div class='del'>-	gboolean has_summary_capability:1;</div><div class='del'>-	gboolean has_search_capability: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'>-	/* signals */</div><div class='del'>-	void		(*folder_changed)	(CamelFolder *, int type);</div><div class='del'>-	void            (*message_changed)      (CamelFolder *,</div><div class='del'>-						 const char *uid);</div><div class='del'>-	</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	void   (*init) (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-			CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-			gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-			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 gchar *  (*get_name)  (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	const gchar *  (*get_full_name)  (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	gboolean   (*can_hold_folders)   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	gboolean   (*can_hold_messages)  (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	CamelFolder *  (*get_subfolder)  (CamelFolder *folder, </div><div class='del'>-					  const gchar *folder_name, </div><div class='del'>-					  gboolean create,</div><div class='del'>-					  CamelException *ex);</div><div class='del'>-</div><div class='del'>-	CamelFolder *  (*get_parent_folder)   (CamelFolder *folder, </div><div class='del'>-					       CamelException *ex);</div><div class='del'>-</div><div class='del'>-	CamelStore *  (*get_parent_store) (CamelFolder *folder, </div><div class='del'>-					   CamelException *ex);</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'>-	gint   (*get_message_count)   (CamelFolder *folder, </div><div class='del'>-				       CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*append_message)  (CamelFolder *folder, </div><div class='del'>-				 CamelMimeMessage *message, </div><div class='del'>-				 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	guint32 (*get_permanent_flags) (CamelFolder *folder,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-	guint32 (*get_message_flags)   (CamelFolder *folder,</div><div class='del'>-					const char *uid,</div><div class='del'>-					CamelException *ex);</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'>-					CamelException *ex);</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'>-					   CamelException *ex);</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'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-	const gchar * (*get_message_uid)  (CamelFolder *folder, </div><div class='del'>-					   CamelMimeMessage *message, </div><div class='del'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-	CamelMimeMessage * (*get_message_by_uid)  (CamelFolder *folder, </div><div class='del'>-						   const gchar *uid, </div><div class='del'>-						   CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*delete_message_by_uid)  (CamelFolder *folder, </div><div class='del'>-					const gchar *uid, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*get_uids)       (CamelFolder *folder,</div><div class='del'>-				       CamelException *ex);</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'>-				       CamelException *ex);</div><div class='del'>-	void (*free_summary)          (CamelFolder *folder,</div><div class='del'>-				       GPtrArray *summary);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*get_subfolder_names) (CamelFolder *folder,</div><div class='del'>-				            CamelException *ex);</div><div class='del'>-	void (*free_subfolder_names)       (CamelFolder *folder,</div><div class='del'>-					    GPtrArray *subfolders);</div><div class='del'>-</div><div class='del'>-	gboolean (*has_search_capability) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	GList * (*search_by_expression) (CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	const CamelMessageInfo * (*summary_get_by_uid) (CamelFolder *, const char *uid);</div><div class='del'>-} CamelFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelFolder *      camel_folder_get_subfolder          (CamelFolder *folder, </div><div class='del'>-							const gchar *folder_name, </div><div class='del'>-							gboolean create,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-</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'>-CamelFolder *      camel_folder_get_parent_folder      (CamelFolder *folder, </div><div class='del'>-							CamelException *ex);</div><div class='del'>-CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder, </div><div class='del'>-							CamelException *ex);</div><div class='del'>-GList *            camel_folder_list_subfolders        (CamelFolder *folder, </div><div class='del'>-							CamelException *ex);</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 gchar *      camel_folder_get_name               (CamelFolder *folder);</div><div class='del'>-const gchar *      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'>-							CamelException *ex);</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'>-							CamelException *ex);</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'>-							CamelException *ex);</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'>-							CamelException *ex);</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'>-							CamelException *ex);</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'>-							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'>-gint               camel_folder_get_message_count     (CamelFolder *folder, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-GPtrArray *        camel_folder_get_summary           (CamelFolder *folder, </div><div class='del'>-						       CamelException *ex);</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'>-GPtrArray *        camel_folder_get_subfolder_names   (CamelFolder *folder, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-void               camel_folder_free_subfolder_names  (CamelFolder *folder,</div><div class='del'>-						       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* uid based access operations */</div><div class='del'>-const gchar *      camel_folder_get_message_uid       (CamelFolder *folder, </div><div class='del'>-						       CamelMimeMessage *message, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-CamelMimeMessage * camel_folder_get_message_by_uid    (CamelFolder *folder, </div><div class='del'>-						       const gchar *uid, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-void               camel_folder_delete_message_by_uid (CamelFolder *folder, </div><div class='del'>-						       const gchar *uid, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-GPtrArray *        camel_folder_get_uids              (CamelFolder *folder, </div><div class='del'>-						       CamelException *ex);</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'>-GList *		   camel_folder_search_by_expression  (CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* summary info. FIXME: rename this slightly? */</div><div class='del'>-const CamelMessageInfo *camel_folder_summary_get_by_uid (CamelFolder *summary,</div><div class='del'>-							 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-internet-address.c b/camel/camel-internet-address.c<br/>deleted file mode 100644<br/>index 003cae5b48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-internet-address.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-internet-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,287 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</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'>-static int    internet_decode		(CamelAddress *, const char *raw);</div><div class='del'>-static char * internet_encode		(CamelAddress *);</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'>-enum SIGNALS {</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'>-camel_internet_address_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'>-			"CamelInternetAddress",</div><div class='del'>-			sizeof (CamelInternetAddress),</div><div class='del'>-			sizeof (CamelInternetAddressClass),</div><div class='del'>-			(GtkClassInitFunc) camel_internet_address_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_internet_address_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 (camel_address_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'>-camel_internet_address_class_init (CamelInternetAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelAddressClass *address = (CamelAddressClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_internet_address_parent = gtk_type_class (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;remove = internet_remove;</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'>-camel_internet_address_init (CamelInternetAddress *obj)</div><div class='del'>-{</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'>-</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, its 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'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char * 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'>-</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 *name = header_encode_string(addr-&gt;name);</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'>-		if (name) {</div><div class='del'>-			g_string_sprintfa(out, "%s ", name);</div><div class='del'>-			g_free(name);</div><div class='del'>-		}</div><div class='del'>-		g_string_sprintfa(out, "&lt;%s&gt;", addr-&gt;address);</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 void   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 ( gtk_type_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: </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_return_val_if_fail(IS_CAMEL_INTERNET_ADDRESS(a), -1);</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: </div><div class='del'>- * @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_return_val_if_fail(IS_CAMEL_INTERNET_ADDRESS(a), -1);</div><div class='del'>-	g_return_val_if_fail(index &gt;= 0, -1);</div><div class='del'>-</div><div class='del'>-	if (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_return_val_if_fail(IS_CAMEL_INTERNET_ADDRESS(a), -1);</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_return_val_if_fail(IS_CAMEL_INTERNET_ADDRESS(a), -1);</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='head'>diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h<br/>deleted file mode 100644<br/>index 14fbd5436a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-internet-address.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-internet-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-#include &lt;camel/camel-address.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_INTERNET_ADDRESS(obj)         GTK_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress)</div><div class='del'>-#define CAMEL_INTERNET_ADDRESS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_internet_address_get_type (), CamelInternetAddressClass)</div><div class='del'>-#define IS_CAMEL_INTERNET_ADDRESS(obj)      GTK_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'>-guint			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'>-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */</div><div class='head'>diff --git a/camel/camel-marshal-utils.c b/camel/camel-marshal-utils.c<br/>deleted file mode 100644<br/>index a743f155d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-marshal-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-marshal-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,343 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-marshal-utils.c : marshal 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-#include "camel-marshal-utils.h"</div><div class='del'>-#include "camel-arg-collector.c"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define NB_OP_CHUNKS 20</div><div class='del'>-static GMemChunk *op_chunk=NULL;</div><div class='del'>-static GStaticMutex op_chunk_mutex = G_STATIC_MUTEX_INIT;</div><div class='del'>-</div><div class='del'>-CamelFuncDef *</div><div class='del'>-camel_func_def_new (CamelMarshal marshal, guint n_params, ...)</div><div class='del'>-{	</div><div class='del'>-	CamelFuncDef *func_def;</div><div class='del'>-	va_list args;</div><div class='del'>-	GtkType type;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	func_def = g_new (CamelFuncDef, 1);</div><div class='del'>-	func_def-&gt;marshal = marshal;</div><div class='del'>-	func_def-&gt;n_params = n_params;</div><div class='del'>-	func_def-&gt;params_type = g_new (GtkType, n_params);</div><div class='del'>-</div><div class='del'>-	va_start (args, n_params);	</div><div class='del'>-	for (i=0; i&lt;n_params; i++) {</div><div class='del'>-		type = va_arg (args, GtkType);</div><div class='del'>-		func_def-&gt;params_type [i] = type; </div><div class='del'>-	}</div><div class='del'>-	va_end (args);</div><div class='del'>-</div><div class='del'>-	return func_def;</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'>-_collect_params (GtkArg	*params,</div><div class='del'>-		 CamelFuncDef *func_def,</div><div class='del'>-		 va_list var_args)</div><div class='del'>-{</div><div class='del'>-  int i;</div><div class='del'>-  gboolean failed = FALSE;</div><div class='del'>-  </div><div class='del'>-</div><div class='del'>-  for (i=0; </div><div class='del'>-       i&lt;func_def-&gt;n_params; </div><div class='del'>-       i++, params++)</div><div class='del'>-    {</div><div class='del'>-      gchar *error;</div><div class='del'>-</div><div class='del'>-      params-&gt;name = NULL;</div><div class='del'>-      params-&gt;type = (func_def-&gt;params_type) [i];</div><div class='del'>-      CAMEL_ARG_COLLECT_VALUE (params,</div><div class='del'>-			       var_args,</div><div class='del'>-			       error);</div><div class='del'>-      if (error)</div><div class='del'>-	{</div><div class='del'>-	  failed = TRUE;</div><div class='del'>-	  g_free (error);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-  return (failed);</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_marshal_create_op: create an operation </div><div class='del'>- * @func_def: function definition object</div><div class='del'>- * @func: function to call</div><div class='del'>- * </div><div class='del'>- * create a function ready to be executed. The </div><div class='del'>- * vari</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: operation ready to be executed</div><div class='del'>- **/</div><div class='del'>-CamelOp *</div><div class='del'>-camel_marshal_create_op (CamelFuncDef *func_def, CamelFunc func, ...)</div><div class='del'>-{</div><div class='del'>-	gboolean error;</div><div class='del'>-	CamelOp *op;</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	g_assert (func_def);</div><div class='del'>-</div><div class='del'>-	op = camel_op_new (func_def);</div><div class='del'>-	op-&gt;func = func;</div><div class='del'>-</div><div class='del'>-	va_start (args, func);</div><div class='del'>-	error = _collect_params (op-&gt;params, func_def, args);</div><div class='del'>-	va_end (args);</div><div class='del'>-	 </div><div class='del'>-	if (error) {</div><div class='del'>-		camel_op_free (op);</div><div class='del'>-		return NULL;</div><div class='del'>-	} else </div><div class='del'>-		return (op);</div><div class='del'>-}</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_op_new: return a new CamelOp object </div><div class='del'>- * </div><div class='del'>- * The obtained object must be destroyed with </div><div class='del'>- * camel_op_free ()</div><div class='del'>- * </div><div class='del'>- * Return value: the newly allocated CamelOp object</div><div class='del'>- **/</div><div class='del'>-CamelOp *</div><div class='del'>-camel_op_new (CamelFuncDef *func_def)</div><div class='del'>-{</div><div class='del'>-	CamelOp *op;</div><div class='del'>-</div><div class='del'>-	g_static_mutex_lock (&amp;op_chunk_mutex);</div><div class='del'>-	if (!op_chunk)</div><div class='del'>-		op_chunk = g_mem_chunk_create (CamelOp, </div><div class='del'>-					       NB_OP_CHUNKS,</div><div class='del'>-					       G_ALLOC_AND_FREE);</div><div class='del'>-	g_static_mutex_unlock (&amp;op_chunk_mutex);</div><div class='del'>-</div><div class='del'>-	op = g_chunk_new (CamelOp, op_chunk);</div><div class='del'>-	op-&gt;func_def = func_def;</div><div class='del'>-	op-&gt;params = g_new (GtkArg, func_def-&gt;n_params);</div><div class='del'>-	</div><div class='del'>-	return op;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_free: free a CamelOp object allocated with camel_op_new</div><div class='del'>- * @op: CamelOp object to free</div><div class='del'>- * </div><div class='del'>- * Free a CamelOp object allocated with camel_op_new ()</div><div class='del'>- * this routine won't work with CamelOp objects allocated </div><div class='del'>- * with other allocators.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_op_free (CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	g_free (op-&gt;params);</div><div class='del'>-	g_chunk_free (op, op_chunk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_run: run an operation </div><div class='del'>- * @op: the operation object</div><div class='del'>- * </div><div class='del'>- * run an operation </div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_op_run (CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	g_assert (op);</div><div class='del'>-	g_assert (op-&gt;func_def);</div><div class='del'>-	g_assert (op-&gt;params);</div><div class='del'>-</div><div class='del'>-	op-&gt;func_def-&gt;marshal (op-&gt;func, op-&gt;params);</div><div class='del'>-}</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_op_set_user_data: set the private field</div><div class='del'>- * @op: operation </div><div class='del'>- * @user_data: private field</div><div class='del'>- * </div><div class='del'>- * associate a field to an operation object</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_op_set_user_data (CamelOp *op, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_assert (op);</div><div class='del'>-	op-&gt;user_data = user_data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_get_user_data: return the private field</div><div class='del'>- * @op: operation object</div><div class='del'>- * </div><div class='del'>- * return the private field associated to </div><div class='del'>- * an operation object.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-gpointer </div><div class='del'>-camel_op_get_user_data (CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	g_assert (op);</div><div class='del'>-	return op-&gt;user_data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* misc marshaller */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelMarshal_NONE__POINTER_INT) (gpointer arg1,</div><div class='del'>-						gint arg2);</div><div class='del'>-void camel_marshal_NONE__POINTER_INT (CamelFunc func, </div><div class='del'>-				      GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__POINTER_INT rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__POINTER_INT) func;</div><div class='del'>-	(* rfunc) (GTK_VALUE_POINTER(args[0]),</div><div class='del'>-		   GTK_VALUE_INT(args[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'>-typedef void (*CamelMarshal_NONE__POINTER_INT_POINTER) (gpointer arg1,</div><div class='del'>-							gint arg2,</div><div class='del'>-							gpointer arg3);</div><div class='del'>-void camel_marshal_NONE__POINTER_INT_POINTER (CamelFunc func, </div><div class='del'>-					      GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__POINTER_INT_POINTER rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__POINTER_INT_POINTER) func;</div><div class='del'>-	(* rfunc) (GTK_VALUE_POINTER(args[0]),</div><div class='del'>-		   GTK_VALUE_INT(args[1]),</div><div class='del'>-		   GTK_VALUE_POINTER(args[2]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelMarshal_NONE__POINTER_BOOL_POINTER) (gpointer arg1,</div><div class='del'>-							 gboolean arg2,</div><div class='del'>-							 gpointer arg3);</div><div class='del'>-void camel_marshal_NONE__POINTER_BOOL_POINTER (CamelFunc func, </div><div class='del'>-					      GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__POINTER_BOOL_POINTER rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__POINTER_BOOL_POINTER) func;</div><div class='del'>-	(* rfunc) (GTK_VALUE_POINTER(args[0]),</div><div class='del'>-		   GTK_VALUE_BOOL(args[1]),</div><div class='del'>-		   GTK_VALUE_POINTER(args[2]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelMarshal_NONE__POINTER_INT_POINTER_POINTER) (gpointer arg1,</div><div class='del'>-								gint arg2,</div><div class='del'>-								gpointer arg3,</div><div class='del'>-								gpointer arg4);</div><div class='del'>-void camel_marshal_NONE__POINTER_INT_POINTER_POINTER (CamelFunc func, </div><div class='del'>-						      GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__POINTER_INT_POINTER_POINTER rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__POINTER_INT_POINTER_POINTER) func;</div><div class='del'>-	(* rfunc) (GTK_VALUE_POINTER(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_POINTER(args[3]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelMarshal_NONE__POINTER_BOOL_POINTER_POINTER) (gpointer arg1,</div><div class='del'>-								 gboolean arg2,</div><div class='del'>-								 gpointer arg3,</div><div class='del'>-								 gpointer arg4);</div><div class='del'>-void camel_marshal_NONE__POINTER_BOOL_POINTER_POINTER (CamelFunc func, </div><div class='del'>-						       GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__POINTER_BOOL_POINTER_POINTER rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__POINTER_BOOL_POINTER_POINTER) func;</div><div class='del'>-	(* rfunc) (GTK_VALUE_POINTER(args[0]),</div><div class='del'>-		   GTK_VALUE_BOOL(args[1]),</div><div class='del'>-		   GTK_VALUE_POINTER(args[2]),</div><div class='del'>-		   GTK_VALUE_POINTER(args[3]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelMarshal_NONE__POINTER_POINTER_POINTER) (gpointer arg1,</div><div class='del'>-							    gpointer arg2,</div><div class='del'>-							    gpointer arg3);</div><div class='del'>-void camel_marshal_NONE__POINTER_POINTER_POINTER (CamelFunc func, </div><div class='del'>-						  GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__POINTER_POINTER_POINTER rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__POINTER_POINTER_POINTER) func;</div><div class='del'>-	(* rfunc) (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'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelMarshal_NONE__INT) (gint arg1);</div><div class='del'>-void camel_marshal_NONE__INT (CamelFunc func, </div><div class='del'>-			      GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelMarshal_NONE__INT rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (CamelMarshal_NONE__INT) func;</div><div class='del'>-	(* rfunc) (GTK_VALUE_INT (args[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'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-marshal-utils.h b/camel/camel-marshal-utils.h<br/>deleted file mode 100644<br/>index d33489d2a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-marshal-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-marshal-utils.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'>-/* camel-maeshal-utils.h : marshal 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MARSHAL_UTILS_H</div><div class='del'>-#define CAMEL_MARSHAL_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;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*CamelFunc) ();</div><div class='del'>-</div><div class='del'>-typedef void ( *CamelMarshal) (CamelFunc func,</div><div class='del'>-				   GtkArg *args);</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'>-</div><div class='del'>-	CamelMarshal marshal;</div><div class='del'>-	guint n_params;</div><div class='del'>-	GtkType	 *params_type;</div><div class='del'>-</div><div class='del'>-} CamelFuncDef;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFuncDef *func_def;</div><div class='del'>-	CamelFunc func;</div><div class='del'>-	GtkArg	*params;</div><div class='del'>-	gpointer user_data;</div><div class='del'>-} CamelOp;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelFuncDef *</div><div class='del'>-camel_func_def_new (CamelMarshal marshal, </div><div class='del'>-		    guint n_params, </div><div class='del'>-		    ...);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelOp *camel_op_new (CamelFuncDef *func_def);</div><div class='del'>-void camel_op_free (CamelOp *op);</div><div class='del'>-void camel_op_run (CamelOp *op);</div><div class='del'>-void camel_op_run_and_free (CamelOp *op);</div><div class='del'>-void camel_op_set_user_data (CamelOp *op, gpointer user_data);</div><div class='del'>-gpointer camel_op_get_user_data (CamelOp *op);</div><div class='del'>-</div><div class='del'>-CamelOp *camel_marshal_create_op (CamelFuncDef *func_def, CamelFunc func, ...);</div><div class='del'>-</div><div class='del'>-/* marshallers */</div><div class='del'>-void camel_marshal_NONE__POINTER_INT_POINTER (CamelFunc func, </div><div class='del'>-					      GtkArg *args);</div><div class='del'>-void camel_marshal_NONE__POINTER_BOOL_POINTER (CamelFunc func, </div><div class='del'>-					      GtkArg *args);</div><div class='del'>-void camel_marshal_NONE__POINTER_INT_POINTER_POINTER (CamelFunc func, </div><div class='del'>-						      GtkArg *args);</div><div class='del'>-void camel_marshal_NONE__POINTER_BOOL_POINTER_POINTER (CamelFunc func, </div><div class='del'>-						       GtkArg *args);</div><div class='del'>-void camel_marshal_NONE__POINTER_POINTER_POINTER (CamelFunc func, </div><div class='del'>-						  GtkArg *args);</div><div class='del'>-void camel_marshal_NONE__INT (CamelFunc func, </div><div class='del'>-			      GtkArg *args);</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_MARSHAL_UTILS_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-medium.c b/camel/camel-medium.c<br/>deleted file mode 100644<br/>index dcc5d31d67..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-medium.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-medium.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,275 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</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 "gmime-content-field.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 (GTK_OBJECT (so)-&gt;klass)</div><div class='del'>-</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 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'>-static void finalize (GtkObject *object);</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_data_wrapper_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_data_wrapper_get_type ());</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;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'>-	gtk_object_class-&gt;finalize = finalize;</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'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_medium_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_medium_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_medium_type) {</div><div class='del'>-		GtkTypeInfo camel_medium_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelMedium",</div><div class='del'>-			sizeof (CamelMedium),</div><div class='del'>-			sizeof (CamelMediumClass),</div><div class='del'>-			(GtkClassInitFunc) camel_medium_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_medium_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'>-		camel_medium_type = gtk_type_unique (camel_data_wrapper_get_type (), &amp;camel_medium_info);</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 void</div><div class='del'>-finalize (GtkObject *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'>-		gtk_object_unref (GTK_OBJECT (medium-&gt;content));</div><div class='del'>-</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'>-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", gtk_type_name(((GtkObject *)medium)-&gt;klass-&gt;type), 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,</div><div class='del'>-			 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 gchar *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::set_header implemented, setting %s", gtk_type_name(((GtkObject *)medium)-&gt;klass-&gt;type), 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.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_set_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'>-remove_header (CamelMedium *medium, const gchar *header_name)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::remove_header implemented, removing %s", gtk_type_name(((GtkObject *)medium)-&gt;klass-&gt;type), 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 gchar *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 gchar *header_name)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::get_header implemented, getting %s", gtk_type_name(((GtkObject *)medium)-&gt;klass-&gt;type), 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 gchar *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'>-#warning No way to get multi-valued headers?</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 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'>-		gtk_object_unref (GTK_OBJECT (medium-&gt;content));</div><div class='del'>-	gtk_object_ref (GTK_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 2b6f77f825..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-medium.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-medium.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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)     (GTK_CHECK_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))</div><div class='del'>-#define CAMEL_MEDIUM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))</div><div class='del'>-#define CAMEL_IS_MEDIUM(o)    (GTK_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))</div><div class='del'>-</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'>-</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'>-	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 Gtk function */</div><div class='del'>-GtkType 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'>-/* 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 60566abf4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-basic.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-basic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,219 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-</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'>-enum SIGNALS {</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'>-camel_mime_filter_basic_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'>-			"CamelMimeFilterBasic",</div><div class='del'>-			sizeof (CamelMimeFilterBasic),</div><div class='del'>-			sizeof (CamelMimeFilterBasicClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_basic_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_filter_basic_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 (camel_mime_filter_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'>-finalise(GtkObject *o)</div><div class='del'>-{</div><div class='del'>-	((GtkObjectClass *)camel_mime_filter_basic_parent)-&gt;finalize (o);</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'>-	f-&gt;state = 0;</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'>-	int 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, FALSE);</div><div class='del'>-		newlen = base64_encode_close(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-		/* FIXME: *3 is probably not quite enough ... */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*3, 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'>-		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'>-		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, 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'>-		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'>-	int 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, FALSE);</div><div class='del'>-		newlen = base64_encode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-		/* FIXME: *3 is probably not quite enough ... */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*3, 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'>-		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'>-		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, 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'>-		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'>-static void</div><div class='del'>-camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_basic_parent = gtk_type_class (camel_mime_filter_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</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'>-	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'>-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'>- * 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 ( gtk_type_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'>-		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'>-	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 f700997fd2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-basic.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-basic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_BASIC(obj)         GTK_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic)</div><div class='del'>-#define CAMEL_MIME_FILTER_BASIC_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_basic_get_type (), CamelMimeFilterBasicClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_BASIC(obj)      GTK_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'>-} 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'>-	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'>-guint		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'>-#endif /* ! _CAMEL_MIME_FILTER_BASIC_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 eb9db60802..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-charset.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-charset.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,243 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;unicode.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 "camel-mime-filter-charset.h"</div><div class='del'>-</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'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_charset_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mime_filter_charset_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'>-			"CamelMimeFilterCharset",</div><div class='del'>-			sizeof (CamelMimeFilterCharset),</div><div class='del'>-			sizeof (CamelMimeFilterCharsetClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_charset_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_filter_charset_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 (camel_mime_filter_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'>-finalise(GtkObject *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 != (unicode_iconv_t)-1) {</div><div class='del'>-		unicode_iconv_close(f-&gt;ic);</div><div class='del'>-		f-&gt;ic = (unicode_iconv_t) -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)camel_mime_filter_charset_parent)-&gt;finalize (o);</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'>-	int 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 != (unicode_iconv_t) -1) {</div><div class='del'>-		buffer = buf;</div><div class='del'>-		unicode_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'>-	int converted;</div><div class='del'>-	char *inbuf, *outbuf;</div><div class='del'>-	int inlen, outlen;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;ic == (unicode_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, 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'>-	if (inlen&gt;0) {</div><div class='del'>-		converted = unicode_iconv(f-&gt;ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-		if (converted == -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 = unicode_iconv(f-&gt;ic, NULL, 0, &amp;outbuf, &amp;outlen);</div><div class='del'>-	if (converted == -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'>-	*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'>-	int converted;</div><div class='del'>-	char *inbuf, *outbuf;</div><div class='del'>-	int inlen, outlen;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;ic == (unicode_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, 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 = unicode_iconv(f-&gt;ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-	if (converted == -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'>-	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'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_charset_parent = gtk_type_class (camel_mime_filter_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</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'>-	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'>-camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;ic = (unicode_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 ( gtk_type_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 ( gtk_type_new (camel_mime_filter_charset_get_type ()));</div><div class='del'>-</div><div class='del'>-	new-&gt;ic = unicode_iconv_open(to_charset, from_charset);</div><div class='del'>-	if (new-&gt;ic == (unicode_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'>-		gtk_object_unref((GtkObject *)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'>-	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 866a9fd6bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-charset.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-charset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_CHARSET(obj)         GTK_CHECK_CAST (obj, camel_mime_filter_charset_get_type (), CamelMimeFilterCharset)</div><div class='del'>-#define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_CHARSET(obj)      GTK_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'>-	unicode_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'>-guint		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'>-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_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 8e3ff2175c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-crlf.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-crlf.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'>- *  Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *           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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-GtkType</div><div class='del'>-camel_mime_filter_crlf_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'>-			"CamelMimeFilterCRLF",</div><div class='del'>-			sizeof (CamelMimeFilterCRLF),</div><div class='del'>-			sizeof (CamelMimeFilterCRLFClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_crlf_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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 (camel_mime_filter_get_type (),</div><div class='del'>-					&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 (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'>-				*q++ = '\r';</div><div class='del'>-			else</div><div class='del'>-				if (do_dots &amp;&amp; *(p - 1) == '\n' &amp;&amp; *p == '.')</div><div class='del'>-					*q++ = '.';</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'>-					if (*p != '\n')</div><div class='del'>-						*q++ = '\r';</div><div class='del'>-					crlf-&gt;saw_cr = FALSE;</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) {</div><div class='del'>-				if (*p == '.' &amp;&amp; *(p - 1) == '\n') {</div><div class='del'>-					crlf-&gt;saw_dot = TRUE;</div><div class='del'>-				} else {</div><div class='del'>-					if (crlf-&gt;saw_dot) {</div><div class='del'>-						if (*p == '.')</div><div class='del'>-							p++;</div><div class='del'>-						crlf-&gt;saw_dot = FALSE;</div><div class='del'>-					}</div><div class='del'>-					*q++ = *p;</div><div class='del'>-				}</div><div class='del'>-			}</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'>-}</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 = gtk_type_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'>-</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 27f78030e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-crlf.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-crlf.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 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *           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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#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)         GTK_CHECK_CAST (obj, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLF)</div><div class='del'>-#define CAMEL_MIME_FILTER_CRLF_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLFClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_CRLF(obj)      GTK_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_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'>-GtkType 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'>-#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 719b9d708a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-from.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-from.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,243 +0,0 @@</div><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 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#include "camel-mime-filter-from.h"</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'>-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'>-static void camel_mime_filter_from_finalise   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_from_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mime_filter_from_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'>-			"CamelMimeFilterFrom",</div><div class='del'>-			sizeof (CamelMimeFilterFrom),</div><div class='del'>-			sizeof (CamelMimeFilterFromClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_from_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_filter_from_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 (camel_mime_filter_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'>-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'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_from_parent = gtk_type_class (camel_mime_filter_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_mime_filter_from_finalise;</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'>-	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'>-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'>-static void</div><div class='del'>-camel_mime_filter_from_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	((GtkObjectClass *)(camel_mime_filter_from_parent))-&gt;finalize((GtkObject *)obj);</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 ( gtk_type_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'>-	gtk_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 2a97bcc0f0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-from.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-from.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#ifndef _CAMEL_MIME_FILTER_FROM_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_FROM_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</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)         GTK_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom)</div><div class='del'>-#define CAMEL_MIME_FILTER_FROM_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_from_get_type (), CamelMimeFilterFromClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_FROM(obj)      GTK_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'>-guint		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'>-#endif /* ! _CAMEL_MIME_FILTER_FROM_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 53a9f72920..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-index.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-index.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-</div><div class='del'>-static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);</div><div class='del'>-static void camel_mime_filter_index_init       (CamelMimeFilterIndex *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_index_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mime_filter_index_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'>-			"CamelMimeFilterIndex",</div><div class='del'>-			sizeof (CamelMimeFilterIndex),</div><div class='del'>-			sizeof (CamelMimeFilterIndexClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_index_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_filter_index_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 (camel_mime_filter_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'>-finalise(GtkObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)o;</div><div class='del'>-</div><div class='del'>-	g_free(f-&gt;name);</div><div class='del'>-	f-&gt;index = NULL;	/* ibex's need refcounting? */</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)camel_mime_filter_index_parent)-&gt;finalize (o);</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'>-	ibex_index_buffer(f-&gt;index, f-&gt;name, in, len, NULL);</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'>-	int inleft = 0;</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'>-	ibex_index_buffer(f-&gt;index, f-&gt;name, in, len, &amp;inleft);</div><div class='del'>-</div><div class='del'>-	if (inleft&gt;0) {</div><div class='del'>-		camel_mime_filter_backup(mf, in+(len-inleft), inleft);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlenptr = len-inleft;</div><div class='del'>-	*outprespace = prespace;</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_index_class_init (CamelMimeFilterIndexClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_index_parent = gtk_type_class (camel_mime_filter_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</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'>-	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'>-camel_mime_filter_index_init (CamelMimeFilterIndex *obj)</div><div class='del'>-{</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 ( gtk_type_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_ibex (ibex *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'>-		new-&gt;name = g_strdup("");</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, char *name)</div><div class='del'>-{</div><div class='del'>-	g_free(mf-&gt;name);</div><div class='del'>-	mf-&gt;name = g_strdup(name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *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'>-	mf-&gt;index = 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 7dcc76b8ea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-index.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-index.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_INDEX(obj)         GTK_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)</div><div class='del'>-#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_INDEX(obj)      GTK_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'>-	ibex *index;</div><div class='del'>-	char *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'>-guint		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_ibex (ibex *);</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 *, char *);</div><div class='del'>-void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *index);</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-save.c b/camel/camel-mime-filter-save.c<br/>deleted file mode 100644<br/>index b5b54a2ee6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-save.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-save.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,160 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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;unistd.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;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-save.h"</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass);</div><div class='del'>-static void camel_mime_filter_save_init       (CamelMimeFilterSave *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_save_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mime_filter_save_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'>-			"CamelMimeFilterSave",</div><div class='del'>-			sizeof (CamelMimeFilterSave),</div><div class='del'>-			sizeof (CamelMimeFilterSaveClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_save_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_filter_save_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 (camel_mime_filter_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'>-finalise(GtkObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)o;</div><div class='del'>-</div><div class='del'>-	g_free(f-&gt;filename);</div><div class='del'>-	if (f-&gt;fd != -1) {</div><div class='del'>-		/* FIXME: what do we do with failed writes???? */</div><div class='del'>-		close(f-&gt;fd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)camel_mime_filter_save_parent)-&gt;finalize (o);</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'>-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)mf;</div><div class='del'>-</div><div class='del'>-	/* i dunno, how do you 'reset' a file?  reopen it? do i care? */</div><div class='del'>-	if (f-&gt;fd != -1){</div><div class='del'>-		lseek(f-&gt;fd, 0, SEEK_SET);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* all this code just to support this little trivial filter! */</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'>-	CamelMimeFilterSave *f = (CamelMimeFilterSave *)mf;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;fd != -1) {</div><div class='del'>-		/* FIXME: check return */</div><div class='del'>-		int outlen = write(f-&gt;fd, in, len);</div><div class='del'>-		if (outlen != len) {</div><div class='del'>-			g_warning("could not write to '%s': %s", f-&gt;filename?f-&gt;filename:"&lt;descriptor&gt;", strerror(errno));</div><div class='del'>-		}</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'>-static void</div><div class='del'>-camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_mime_filter_save_parent = gtk_type_class (camel_mime_filter_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</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'>-</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'>-camel_mime_filter_save_init (CamelMimeFilterSave *f)</div><div class='del'>-{</div><div class='del'>-	f-&gt;fd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_save_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterSave object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterSave widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterSave *</div><div class='del'>-camel_mime_filter_save_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterSave *new = CAMEL_MIME_FILTER_SAVE ( gtk_type_new (camel_mime_filter_save_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterSave *</div><div class='del'>-camel_mime_filter_save_new_name (const char *name, int flags, int mode)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterSave *new = NULL;</div><div class='del'>-</div><div class='del'>-	new = camel_mime_filter_save_new();</div><div class='del'>-	if (new) {</div><div class='del'>-		new-&gt;fd = open(name, flags, mode);</div><div class='del'>-		if (new-&gt;fd != -1) {</div><div class='del'>-			new-&gt;filename = g_strdup(name);</div><div class='del'>-		} else {</div><div class='del'>-			gtk_object_unref((GtkObject *)new);</div><div class='del'>-			new = NULL;</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='head'>diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h<br/>deleted file mode 100644<br/>index eb6e448560..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-save.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter-save.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_SAVE(obj)         GTK_CHECK_CAST (obj, camel_mime_filter_save_get_type (), CamelMimeFilterSave)</div><div class='del'>-#define CAMEL_MIME_FILTER_SAVE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_SAVE(obj)      GTK_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'>-	struct _CamelMimeFilterSavePrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *filename;</div><div class='del'>-	int fd;</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'>-guint		camel_mime_filter_save_get_type	(void);</div><div class='del'>-CamelMimeFilterSave      *camel_mime_filter_save_new	(void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilterSave *camel_mime_filter_save_new_name (const char *name, int flags, int mode);</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.c b/camel/camel-mime-filter.c<br/>deleted file mode 100644<br/>index 27cee890fe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,228 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter.h"</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 *)((GtkObject *)(o))-&gt;klass)</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_class_init (CamelMimeFilterClass *klass);</div><div class='del'>-static void camel_mime_filter_init       (CamelMimeFilter *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_mime_filter_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mime_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'>-			"CamelMimeFilter",</div><div class='del'>-			sizeof (CamelMimeFilter),</div><div class='del'>-			sizeof (CamelMimeFilterClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_filter_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_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 (camel_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'>-finalise(GtkObject *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'>-	((GtkObjectClass *)camel_mime_filter_parent)-&gt;finalize (o);</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'>-static void</div><div class='del'>-camel_mime_filter_class_init (CamelMimeFilterClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_parent = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</div><div class='del'>-</div><div class='del'>-	klass-&gt;complete = complete;</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'>-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'>-/**</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 ( gtk_type_new (camel_mime_filter_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</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'>-	/*</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'>-	/* 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'>-</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, 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 4576596bab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-filter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER(obj)         GTK_CHECK_CAST (obj, camel_mime_filter_get_type (), CamelMimeFilter)</div><div class='del'>-#define CAMEL_MIME_FILTER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER(obj)      GTK_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'>-	int outsize;</div><div class='del'>-	int outpre;		/* prespace of this buffer */</div><div class='del'>-</div><div class='del'>-	char *backbuf;</div><div class='del'>-	int backsize;</div><div class='del'>-	int 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'>-guint		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, 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'>-#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 0e78ca6912..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-message.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-message.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,538 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include "gmime-content-field.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'>-/* 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_CC,</div><div class='del'>-	HEADER_BCC,</div><div class='del'>-	HEADER_DATE</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", "Cc", "Bcc", "Date", 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", 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 finalize (GtkObject *object);</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'>-</div><div class='del'>-/* Returns the class for a CamelMimeMessage */</div><div class='del'>-#define CMM_CLASS(so) CAMEL_MIME_MESSAGE_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (GTK_OBJECT(so)-&gt;klass)</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'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_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 = gtk_type_class (camel_mime_part_get_type ());</div><div class='del'>-</div><div class='del'>-	header_name_table = g_hash_table_new (g_str_hash, g_str_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'>-	gtk_object_class-&gt;finalize = finalize;</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'>-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_str = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_mime_message_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_mime_message_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_mime_message_type)	{</div><div class='del'>-		GtkTypeInfo camel_mime_message_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMimeMessage",</div><div class='del'>-			sizeof (CamelMimeMessage),</div><div class='del'>-			sizeof (CamelMimeMessageClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_message_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_message_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'>-		camel_mime_message_type = gtk_type_unique (camel_mime_part_get_type (), &amp;camel_mime_message_info);</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'>-/* annoying way to free objects in a hashtable, i mean, its not like anyone</div><div class='del'>-   would want to store them in a hashtable, really */</div><div class='del'>-static void g_lib_is_uber_crappy_shit(gpointer whocares, gpointer getlost, gpointer blah)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref((GtkObject *)getlost);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-finalize (GtkObject *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;date_str);</div><div class='del'>-	g_free (message-&gt;subject);</div><div class='del'>-	g_free (message-&gt;reply_to);</div><div class='del'>-	g_free (message-&gt;from);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (message-&gt;recipients, g_lib_is_uber_crappy_shit, NULL);</div><div class='del'>-	g_hash_table_destroy(message-&gt;recipients);</div><div class='del'>-</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'>-</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 = gtk_type_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'>-</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'>-	g_assert(message);</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'>-		offset = 0;</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'>-	}</div><div class='del'>-	message-&gt;date = date;</div><div class='del'>-	message-&gt;date_offset = offset;</div><div class='del'>-	g_free(message-&gt;date_str);</div><div class='del'>-	message-&gt;date_str = header_format_date(date, offset);</div><div class='del'>-</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)message, "Date", message-&gt;date_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_get_date(CamelMimeMessage *message,  time_t *date, int *offset)</div><div class='del'>-{</div><div class='del'>-	if (message-&gt;date == CAMEL_MESSAGE_DATE_CURRENT)</div><div class='del'>-		camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0);</div><div class='del'>-	if (date)</div><div class='del'>-		*date = message-&gt;date;</div><div class='del'>-	if (offset)</div><div class='del'>-		*offset = message-&gt;date_offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_mime_message_get_date_string(CamelMimeMessage *message)</div><div class='del'>-{</div><div class='del'>-	if (message-&gt;date == CAMEL_MESSAGE_DATE_CURRENT)</div><div class='del'>-		camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0);</div><div class='del'>-	return message-&gt;date_str;</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 *mime_message, const gchar *reply_to)</div><div class='del'>-{</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-</div><div class='del'>-	/* FIXME: check format of string, handle it nicer ... */</div><div class='del'>-</div><div class='del'>-	g_free(mime_message-&gt;reply_to);</div><div class='del'>-	mime_message-&gt;reply_to = g_strdup(reply_to);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)mime_message, "Reply-To", reply_to);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</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'>-	return mime_message-&gt;reply_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_subject (CamelMimeMessage *mime_message,</div><div class='del'>-				const gchar *subject)</div><div class='del'>-{</div><div class='del'>-	char *text;</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_strdup(subject);</div><div class='del'>-	text = header_encode_string(subject);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)mime_message, "Subject", 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_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'>-void</div><div class='del'>-camel_mime_message_set_from (CamelMimeMessage *mime_message, const gchar *from)</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;from);</div><div class='del'>-	mime_message-&gt;from = g_strdup(from);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)mime_message, "From", from);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</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'>-	return mime_message-&gt;from;</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_mime_message_add_recipient (CamelMimeMessage *mime_message, </div><div class='del'>-				  const gchar *type, </div><div class='del'>-				  const gchar *name, const char *address)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *addr;</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'>-	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 add a non-valid receipient type: %s = %s %s", type, name, address);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_internet_address_add(addr, name, address);</div><div class='del'>-</div><div class='del'>-	/* FIXME: maybe this should be delayed till we're ready to write out? */</div><div class='del'>-	text = camel_address_encode((CamelAddress*)addr);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)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_remove_recipient_address (CamelMimeMessage *mime_message,</div><div class='del'>-					     const gchar *type,</div><div class='del'>-					     const gchar *address)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	int index;</div><div class='del'>-	char *text;</div><div class='del'>-</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 remove a non-valid receipient type: %s = %s", type, address);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	index = camel_internet_address_find_address(addr, address, NULL);</div><div class='del'>-	if (index == -1) {</div><div class='del'>-		g_warning("trying to remove address for nonexistand address: %s", address);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_address_remove((CamelAddress *)addr, index);</div><div class='del'>-</div><div class='del'>-	/* FIXME: maybe this should be delayed till we're ready to write out? */</div><div class='del'>-	text = camel_address_encode((CamelAddress *)addr);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)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_remove_recipient_name (CamelMimeMessage *mime_message,</div><div class='del'>-					  const gchar *type,</div><div class='del'>-					  const gchar *name)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	int index;</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'>-	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 remove a non-valid receipient type: %s = %s", type, name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	index = camel_internet_address_find_name(addr, name, NULL);</div><div class='del'>-	if (index == -1) {</div><div class='del'>-		g_warning("trying to remove address for nonexistand name: %s", name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_address_remove((CamelAddress *)addr, index);</div><div class='del'>-</div><div class='del'>-	/* FIXME: maybe this should be delayed till we're ready to write out? */</div><div class='del'>-	text = camel_address_encode((CamelAddress *)addr);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header((CamelMedium *)mime_message, type, text);</div><div class='del'>-	g_free(text);</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, </div><div class='del'>-				   const gchar *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'>-</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'>-</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'>-#warning "return a real error code"</div><div class='del'>-	return 0;</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'>-		g_warning("No from set for message");</div><div class='del'>-		camel_mime_message_set_from(mm, "");</div><div class='del'>-	}</div><div class='del'>-	if (mm-&gt;date_str == NULL) {</div><div class='del'>-		g_warning("Application did not set date, using 'now'");</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'>-		g_warning("Application did not set subject, creating one");</div><div class='del'>-		camel_mime_message_set_subject(mm, "No Subject");</div><div class='del'>-	}</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'>-	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'>-static char *</div><div class='del'>-format_address(const char *text)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *addr;</div><div class='del'>-	char *ret;</div><div class='del'>-</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'>-	return ret;</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'>-</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'>-		g_free(message-&gt;from);</div><div class='del'>-		message-&gt;from = format_address(header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_REPLY_TO:</div><div class='del'>-		g_free(message-&gt;reply_to);</div><div class='del'>-		message-&gt;reply_to = format_address(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'>-		message-&gt;subject = header_decode_string(header_value);</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'>-		addr = g_hash_table_lookup(message-&gt;recipients, header_name);</div><div class='del'>-		if (header_value)</div><div class='del'>-			camel_address_decode((CamelAddress *)addr, header_value);</div><div class='del'>-		else</div><div class='del'>-			camel_address_remove((CamelAddress *)addr, -1);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_DATE:</div><div class='del'>-		g_free(message-&gt;date_str);</div><div class='del'>-		message-&gt;date_str = g_strdup(header_value);</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'>-		}</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'>-	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='head'>diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h<br/>deleted file mode 100644<br/>index b52da923a9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-message.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-message.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; 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-</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'>-</div><div class='del'>-#define CAMEL_MIME_MESSAGE_TYPE     (camel_mime_message_get_type ())</div><div class='del'>-#define CAMEL_MIME_MESSAGE(obj)     (GTK_CHECK_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))</div><div class='del'>-#define CAMEL_MIME_MESSAGE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))</div><div class='del'>-#define CAMEL_IS_MIME_MESSAGE(o)    (GTK_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'>-	char *date_str;		/* cached copy of date string */</div><div class='del'>-</div><div class='del'>-	gchar *subject;</div><div class='del'>-	gchar *reply_to;</div><div class='del'>-</div><div class='del'>-	gchar *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 Gtk function */</div><div class='del'>-GtkType 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'>-</div><div class='del'>-</div><div class='del'>-void               camel_mime_message_set_date		   (CamelMimeMessage *mime_message,  time_t date, int offset);</div><div class='del'>-void               camel_mime_message_get_date		   (CamelMimeMessage *mime_message,  time_t *date, int *offset);</div><div class='del'>-char		  *camel_mime_message_get_date_string	   (CamelMimeMessage *mime_message);</div><div class='del'>-</div><div class='del'>-const gchar *      camel_mime_message_get_received_date    (CamelMimeMessage *mime_message);</div><div class='del'>-const gchar *      camel_mime_message_get_sent_date        (CamelMimeMessage *mime_message);</div><div class='del'>-void               camel_mime_message_set_reply_to         (CamelMimeMessage *mime_message, </div><div class='del'>-							    const gchar *reply_to);</div><div class='del'>-const gchar *      camel_mime_message_get_reply_to         (CamelMimeMessage *mime_message);</div><div class='del'>-void               camel_mime_message_set_subject          (CamelMimeMessage *mime_message, </div><div class='del'>-							    const gchar *subject);</div><div class='del'>-const gchar *      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 gchar *from);</div><div class='del'>-const gchar *      camel_mime_message_get_from             (CamelMimeMessage *mime_message);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void		camel_mime_message_add_recipient (CamelMimeMessage *mime_message,</div><div class='del'>-						  const char *type, const char *name, const char *address);</div><div class='del'>-void		camel_mime_message_remove_recipient_address (CamelMimeMessage *mime_message, </div><div class='del'>-							     const char *type, const char *address);</div><div class='del'>-void		camel_mime_message_remove_recipient_name (CamelMimeMessage *mime_message, </div><div class='del'>-							  const char *type, const char *name);</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'>-</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 c8dc4fb61c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-parser.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-parser.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1804 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-#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;unicode.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'>-	/* 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'>-	int 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'>-	int midline;		/* are we mid-line interrupted? */</div><div class='del'>-	int scan_from;		/* do we care about From lines? */</div><div class='del'>-</div><div class='del'>-	int start_of_from;	/* where from started */</div><div class='del'>-	int start_of_headers;	/* where headers started from the last scan */</div><div class='del'>-</div><div class='del'>-	int header_start;	/* start of last header, or -1 */</div><div class='del'>-</div><div class='del'>-	struct _header_scan_stack *top_part;	/* top of message header */</div><div class='del'>-	int top_start;		/* offset of start */</div><div class='del'>-</div><div class='del'>-	struct _header_scan_stack *pending; /* if we're pending part info, from the wrong part end */</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'>-	char *boundary;		/* for multipart/ * boundaries, including leading -- and trailing -- for the final part */</div><div class='del'>-	int boundarylen;	/* length of boundary, including leading -- */</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);</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'>-#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'>-static char *states[] = {</div><div class='del'>-	"HSCAN_INITIAL",</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'>-	"&lt;invalid&gt;",</div><div class='del'>-</div><div class='del'>-	"HSCAN_EOF",		/* end of file */</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'>-</div><div class='del'>-static CamelObjectClass *camel_mime_parser_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mime_parser_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'>-			"CamelMimeParser",</div><div class='del'>-			sizeof (CamelMimeParser),</div><div class='del'>-			sizeof (CamelMimeParserClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_parser_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_parser_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 (camel_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'>-finalise(GtkObject *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'>-	((GtkObjectClass *)camel_mime_parser_parent)-&gt;finalize (o);</div><div class='del'>-}</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'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_parser_parent = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</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'>-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'>-/**</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 ( gtk_type_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'>-	gtk_object_ref((GtkObject *)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'>-			gtk_object_unref((GtkObject *)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'>-/**</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'>-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_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 its 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_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'>-/* ********************************************************************** */</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'>-	}</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'>-	}</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'>-	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'>-		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)</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'>-		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-2;	/* 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", len, 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;boundarylen &lt;= len+2) {</div><div class='del'>-				h(printf("checking lastone\n"));</div><div class='del'>-				*lastone = (boundary[part-&gt;boundarylen]=='-'</div><div class='del'>-					    &amp;&amp; boundary[part-&gt;boundarylen+1]=='-');</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'>-	d(printf("Header: %s: %s\n", name, value));</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'>-   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;= (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'>-	memcpy(s-&gt;outptr, start, headerlen);					\</div><div class='del'>-	s-&gt;outptr += headerlen;							\</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;</div><div class='del'>-	char *start;</div><div class='del'>-	int len;</div><div class='del'>-	struct _header_scan_stack *part, *overpart = s-&gt;parts;</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'>-	/* FIXME: this info should be cached ? */</div><div class='del'>-	part = s-&gt;parts;</div><div class='del'>-	s-&gt;atleast = 5;</div><div class='del'>-	while (part) {</div><div class='del'>-		if (part-&gt;boundary)</div><div class='del'>-			s-&gt;atleast = MAX(s-&gt;atleast, part-&gt;boundarylen+2);</div><div class='del'>-		part = part-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	s-&gt;atleast = MAX(s-&gt;atleast, 5);</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		s-&gt;atleast = MAX(s-&gt;atleast, s-&gt;parts-&gt;boundarylen+2);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	*lastone = FALSE;</div><div class='del'>-retry:</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;</div><div class='del'>-</div><div class='del'>-		while (inptr&lt;=inend) {</div><div class='del'>-			/*printf("  '%.20s'\n", inptr);*/</div><div class='del'>-</div><div class='del'>-			start = inptr;</div><div class='del'>-</div><div class='del'>-			if (!s-&gt;midline) {</div><div class='del'>-				if ((part = folder_boundary_check(s, inptr, lastone))) {</div><div class='del'>-					if ((s-&gt;outptr&gt;s-&gt;outbuf) || (inptr-start))</div><div class='del'>-						goto header_truncated; /* may not actually be truncated */</div><div class='del'>-</div><div class='del'>-					goto normal_exit;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* Replace any number of spaces and tabs at the start of the line with</div><div class='del'>-				 * a single space.</div><div class='del'>-				 */</div><div class='del'>-				if (*start == ' ' || *start == '\t') {</div><div class='del'>-					static char *space = " ";</div><div class='del'>-					do</div><div class='del'>-						start++;</div><div class='del'>-					while (*start == ' ' || *start == '\t');</div><div class='del'>-					header_append(s, space, space + 1);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* goto next line */</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'>-			header_append(s, start, inptr-1);</div><div class='del'>-</div><div class='del'>-			/* check against the real buffer end, not our 'atleast limited' end */</div><div class='del'>-			/* also make sure we have at least 1 char lookahead, so even if we found a \n at</div><div class='del'>-			   the end, well, make out we didn't, and re-scan it next pass */</div><div class='del'>-			if (inptr&gt;=s-&gt;inend) {</div><div class='del'>-				inptr--;</div><div class='del'>-				s-&gt;midline = TRUE;</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'>-			h(printf("outbuf[0] = %02x '%c' oubuf[1] = %02x '%c'\n",</div><div class='del'>-				 s-&gt;outbuf[0], isprint(s-&gt;outbuf[0])?s-&gt;outbuf[0]:'.',</div><div class='del'>-				 s-&gt;outbuf[1], isprint(s-&gt;outbuf[1])?s-&gt;outbuf[1]:'.'));</div><div class='del'>-</div><div class='del'>-			if (!s-&gt;midline</div><div class='del'>-			    &amp;&amp; !(inptr[0] == ' ' || inptr[0] == '\t')) {</div><div class='del'>-				if (s-&gt;outbuf[0] == '\n'</div><div class='del'>-				    || (s-&gt;outbuf[0] == '\r' &amp;&amp; s-&gt;outbuf[1]=='\n')) {</div><div class='del'>-					goto header_done;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* we always have at least _1_ char here ... */</div><div class='del'>-				if (s-&gt;outptr[-1] == '\n')</div><div class='del'>-					s-&gt;outptr--;</div><div class='del'>-				s-&gt;outptr[0] = 0;</div><div class='del'>-				</div><div class='del'>-				d(printf("header %.10s 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'>-				</div><div class='del'>-				if (inptr[0]=='\n'</div><div class='del'>-				    || (inptr[0] == '\r' &amp;&amp; inptr[1]=='\n')) {</div><div class='del'>-					inptr++;</div><div class='del'>-					goto header_done;</div><div class='del'>-				}</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'>-		s-&gt;inptr = inptr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ok, we're at the end of the data, just make sure we're not missing out some small</div><div class='del'>-	   truncated header markers */</div><div class='del'>-	if (overpart) {</div><div class='del'>-		overpart = overpart-&gt;parent;</div><div class='del'>-		while (overpart) {</div><div class='del'>-			if (overpart-&gt;boundary &amp;&amp; (overpart-&gt;boundarylen+2) &lt; s-&gt;atleast) {</div><div class='del'>-				s-&gt;atleast = overpart-&gt;boundarylen+2;</div><div class='del'>-				h(printf("Retrying next smaller part ...\n"));</div><div class='del'>-				goto retry;</div><div class='del'>-			}</div><div class='del'>-			overpart = overpart-&gt;parent;</div><div class='del'>-		}</div><div class='del'>-	}</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'>-		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'>-</div><div class='del'>-	header_append(s, start, inptr);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;outptr&gt;s-&gt;outbuf &amp;&amp; s-&gt;outptr[-1] == '\n')</div><div class='del'>-		s-&gt;outptr--;</div><div class='del'>-	s-&gt;outptr[0] = 0;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;outbuf[0] == '\n'</div><div class='del'>-	    || (s-&gt;outbuf[0] == '\r' &amp;&amp; s-&gt;outbuf[1]=='\n')) {</div><div class='del'>-		goto header_done;</div><div class='del'>-	}</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'>-header_done:</div><div class='del'>-	part = s-&gt;parts;</div><div class='del'>-</div><div class='del'>-	s-&gt;outptr = s-&gt;outbuf;</div><div class='del'>-normal_exit:</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;</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, *overpart = s-&gt;parts;</div><div class='del'>-	int already_packed = FALSE;</div><div class='del'>-</div><div class='del'>-	/*printf("scanning content\n");*/</div><div class='del'>-</div><div class='del'>-	/* FIXME: this info should be cached ? */</div><div class='del'>-	part = s-&gt;parts;</div><div class='del'>-	s-&gt;atleast = 5;</div><div class='del'>-	while (part) {</div><div class='del'>-		if (part-&gt;boundary) {</div><div class='del'>-			c(printf("boundary: %s\n", part-&gt;boundary));</div><div class='del'>-			s-&gt;atleast = MAX(s-&gt;atleast, part-&gt;boundarylen+2);</div><div class='del'>-		}</div><div class='del'>-		part = part-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-/*	s-&gt;atleast = MAX(s-&gt;atleast, 5);*/</div><div class='del'>-#if 0</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		s-&gt;atleast = MAX(s-&gt;atleast, s-&gt;parts-&gt;boundarylen+2);</div><div class='del'>-#endif</div><div class='del'>-	*lastone = FALSE;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	c(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;</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'>-				if ( (inptr-start) )</div><div class='del'>-					goto content;</div><div class='del'>-				</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 against the real buffer end, not our 'atleast limited' end */</div><div class='del'>-			if (inptr&gt; s-&gt;inend) {</div><div class='del'>-				inptr--;</div><div class='del'>-				s-&gt;midline = TRUE;</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'>-			g_assert(inptr&lt;=s-&gt;inend);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* *sigh* so much for the beautiful simplicity of the code so far - here we</div><div class='del'>-		   have the snot to deal with the nasty end-cases that come from the read-ahead</div><div class='del'>-		   buffers we use */</div><div class='del'>-		/* what this does, is if we are somewhere near the end of the buffer,</div><div class='del'>-		   force it to the front, and re-read, ensuring we bunch as much together</div><div class='del'>-		   as possible, for the final read, without copying too much of the time */</div><div class='del'>-		/* make sure we dont loop forever, but also make sure we try smaller</div><div class='del'>-		   boundaries, if there are any, so we dont miss any. */</div><div class='del'>-		/* this is not needed for the header scanner, since it copies its own</div><div class='del'>-		   data */</div><div class='del'>-		c(printf("start offset = %d  atleast = %d\n", start-s-&gt;inbuf, s-&gt;atleast));</div><div class='del'>-		if (start &gt; (s-&gt;inbuf + s-&gt;atleast)) {</div><div class='del'>-			/* force a re-scan of this data */</div><div class='del'>-			s-&gt;inptr = start;</div><div class='del'>-			if (already_packed)</div><div class='del'>-				goto smaller_boundary;</div><div class='del'>-			c(printf("near the end, try and bunch things up a bit first\n"));</div><div class='del'>-			already_packed = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			c(printf("dumping what i've got ...\n"));</div><div class='del'>-			/* what would be nice here, is if that we're at eof, we bunch the last</div><div class='del'>-			   little bit in the same content, but i dont think this is easy */</div><div class='del'>-			goto content_mid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c(printf("length read = %d\n", len));</div><div class='del'>-smaller_boundary:</div><div class='del'>-</div><div class='del'>-	/* ok, we're at the end of the data, just make sure we're not missing out some small</div><div class='del'>-	   truncated header markers */</div><div class='del'>-	if (overpart) {</div><div class='del'>-		overpart = overpart-&gt;parent;</div><div class='del'>-		while (overpart) {</div><div class='del'>-			if (overpart-&gt;boundary &amp;&amp; (overpart-&gt;boundarylen+2) &lt; s-&gt;atleast) {</div><div class='del'>-				s-&gt;atleast = overpart-&gt;boundarylen+2;</div><div class='del'>-				c(printf("Retrying next smaller part ...\n"));</div><div class='del'>-				goto retry;</div><div class='del'>-			}</div><div class='del'>-			overpart = overpart-&gt;parent;</div><div class='del'>-		}</div><div class='del'>-	}</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_mid:</div><div class='del'>-	s-&gt;midline = TRUE;</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'>-	*length = inptr-start;</div><div class='del'>-</div><div class='del'>-/*	printf("got %scontent: %.*s", 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'>-		gtk_object_unref((GtkObject *)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'>-</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'>-</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 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'>-		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'>-			gtk_object_unref((GtkObject *)s-&gt;stream);</div><div class='del'>-			s-&gt;stream = NULL;</div><div class='del'>-		}</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'>-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'>-		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'>-			gtk_object_unref((GtkObject *)s-&gt;stream);</div><div class='del'>-		s-&gt;stream = stream;</div><div class='del'>-		gtk_object_ref((GtkObject *)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'>-		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'>-#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'>-	case HSCAN_INITIAL:</div><div class='del'>-#ifdef USE_FROM</div><div class='del'>-		if (s-&gt;scan_from) {</div><div class='del'>-			/* FIXME: it would be nice not to have to allocate this every pass */</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'>-			folder_push_part(s, h);</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'>-			} 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);</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'>-			s-&gt;start_of_from = -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#endif</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;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, "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'>-			if (*datalength&gt;0) {</div><div class='del'>-				d(printf("Content raw: '%.*s'\n", *datalength, *databuffer));</div><div class='del'>-</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'>-					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_filter(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'>-		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'>-					/* FIXME: needs a state to return this shit??? */</div><div class='del'>-					d(printf("Multipart Content: '%.*s'\n", *datalength, *databuffer));</div><div class='del'>-				}</div><div class='del'>-			} while (hb==h &amp;&amp; *datalength&gt;0);</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);</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'>-		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(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'>-						folder_push_filter_charset(s, "UTF-8", charset);</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");</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'>-					folder_push_filter_save(s, attachname);</div><div class='del'>-					g_free(attachname);</div><div class='del'>-					folder_push_filter_mime(s, 0);</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'>-					folder_push_filter_save(s, attachname);</div><div class='del'>-					g_free(attachname);</div><div class='del'>-					folder_push_filter_mime(s, 1);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			case HSCAN_BODY:</div><div class='del'>-				break;</div><div class='del'>-			case HSCAN_BODY_END:</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " base64", 7)) {</div><div class='del'>-					printf("removing filters\n");</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-					folder_filter_pull(s);</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'>-					folder_filter_pull(s);</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-				}</div><div class='del'>-				if (charset) {</div><div class='del'>-					folder_filter_pull(s);</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 2283ec6f98..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-parser.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-parser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#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)         GTK_CHECK_CAST (obj, camel_mime_parser_get_type (), CamelMimeParser)</div><div class='del'>-#define CAMEL_MIME_PARSER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass)</div><div class='del'>-#define IS_CAMEL_MIME_PARSER(obj)      GTK_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_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_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'>-guint		camel_mime_parser_get_type	(void);</div><div class='del'>-CamelMimeParser      *camel_mime_parser_new	(void);</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'>-</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'>-/* 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'>-/* 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'>-#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 656520030c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-part-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,234 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "gmime-content-field.h"</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-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'>-</div><div class='del'>-#define d(x)</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'>-	GByteArray *buffer;</div><div class='del'>-	char *buf;</div><div class='del'>-	int len;</div><div class='del'>-	off_t start, end;	/* ignore the start may be used unitialised warning */</div><div class='del'>-	CamelMimeFilter *fdec = NULL, *fcrlf = NULL, *fch = NULL;</div><div class='del'>-	struct _header_content_type *ct;</div><div class='del'>-	int decid=-1, crlfid=-1, chrid=-1, cache=TRUE;</div><div class='del'>-	CamelStream *source;</div><div class='del'>-	CamelSeekableStream *seekable_source; /* and ignore the warning about this one too. */</div><div class='del'>-	char *encoding;</div><div class='del'>-</div><div class='del'>-	d(printf("constructing data-wrapper\n"));</div><div class='del'>-</div><div class='del'>-		/* Ok, try and be smart.  If we're storing a small message (typical) convert it,</div><div class='del'>-		   and store it in memory as we parse it ... if not, throw away the conversion</div><div class='del'>-		   and scan till the end ... */</div><div class='del'>-</div><div class='del'>-		/* if we can't seek, dont have a stream/etc, then we must cache it */</div><div class='del'>-	source = camel_mime_parser_stream(mp);</div><div class='del'>-	if (source) {</div><div class='del'>-		gtk_object_ref((GtkObject *)source);</div><div class='del'>-		if (CAMEL_IS_SEEKABLE_STREAM (source)) {</div><div class='del'>-			seekable_source = CAMEL_SEEKABLE_STREAM (source);</div><div class='del'>-			cache = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</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'>-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC);</div><div class='del'>-			decid = camel_mime_parser_filter_add(mp, fdec);</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'>-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC);</div><div class='del'>-			decid = camel_mime_parser_filter_add(mp, fdec);</div><div class='del'>-		}</div><div class='del'>-		g_free(encoding);</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'>-		const char *charset = header_content_type_param(ct, "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'>-		if (charset!=NULL</div><div class='del'>-		    &amp;&amp; !(strcasecmp(charset, "us-ascii")==0</div><div class='del'>-			 || strcasecmp(charset, "iso-8859-1")==0)) {</div><div class='del'>-			d(printf("Adding conversion filter from %s to iso-8859-1\n", charset));</div><div class='del'>-			fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "iso-8859-1");</div><div class='del'>-			if (fch) {</div><div class='del'>-				chrid = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)fch);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("Cannot convert '%s' to 'iso-8859-1', message display may be corrupt", charset);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buffer = g_byte_array_new();</div><div class='del'>-</div><div class='del'>-	if (!cache) {</div><div class='del'>-		start = camel_mime_parser_tell(mp) + seekable_source-&gt;bound_start;</div><div class='del'>-	}</div><div class='del'>-	while ( camel_mime_parser_step(mp, &amp;buf, &amp;len) != HSCAN_BODY_END ) {</div><div class='del'>-		if (buffer) {</div><div class='del'>-			if (buffer-&gt;len &gt; 20480 &amp;&amp; !cache) {</div><div class='del'>-				/* is this a 'big' message?  Yes?  We dont want to convert it all then.*/</div><div class='del'>-				camel_mime_parser_filter_remove(mp, decid);</div><div class='del'>-				camel_mime_parser_filter_remove(mp, chrid);</div><div class='del'>-				decid = -1;</div><div class='del'>-				chrid = -1;</div><div class='del'>-				g_byte_array_free(buffer, TRUE);</div><div class='del'>-				buffer = NULL;</div><div class='del'>-			} else {</div><div class='del'>-				g_byte_array_append(buffer, buf, len);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (buffer) {</div><div class='del'>-		CamelStream *mem;</div><div class='del'>-		d(printf("Small message part, kept in memory!\n"));</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'>-		gtk_object_unref ((GtkObject *)mem);</div><div class='del'>-	} else {</div><div class='del'>-		CamelStream *sub;</div><div class='del'>-		CamelStreamFilter *filter;</div><div class='del'>-</div><div class='del'>-		d(printf("Big message part, left on disk ...\n"));</div><div class='del'>-</div><div class='del'>-		end = camel_mime_parser_tell(mp) + seekable_source-&gt;bound_start;</div><div class='del'>-		sub = camel_seekable_substream_new_with_seekable_stream_and_bounds (seekable_source, start, end);</div><div class='del'>-		if (fdec || fch) {</div><div class='del'>-			filter = camel_stream_filter_new_with_stream(sub);</div><div class='del'>-			if (fdec) {</div><div class='del'>-				camel_mime_filter_reset(fdec);</div><div class='del'>-				camel_stream_filter_add(filter, fdec);</div><div class='del'>-			}</div><div class='del'>-			if (fcrlf) {</div><div class='del'>-				camel_mime_filter_reset(fcrlf);</div><div class='del'>-				camel_stream_filter_add(filter, fcrlf);</div><div class='del'>-			}</div><div class='del'>-			if (fch) {</div><div class='del'>-				camel_mime_filter_reset(fch);</div><div class='del'>-				camel_stream_filter_add(filter, fch);</div><div class='del'>-			}</div><div class='del'>-			camel_data_wrapper_construct_from_stream (dw, (CamelStream *)filter);</div><div class='del'>-			gtk_object_unref ((GtkObject *)filter);</div><div class='del'>-		} else {</div><div class='del'>-			camel_data_wrapper_construct_from_stream (dw, sub);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref ((GtkObject *)sub);</div><div class='del'>-	}</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'>-	camel_mime_parser_filter_remove(mp, chrid);</div><div class='del'>-</div><div class='del'>-	if (fdec)</div><div class='del'>-		gtk_object_unref((GtkObject *)fdec);</div><div class='del'>-	if (fcrlf)</div><div class='del'>-		gtk_object_unref((GtkObject *)fcrlf);</div><div class='del'>-	if (fch)</div><div class='del'>-		gtk_object_unref((GtkObject *)fch);</div><div class='del'>-	if (source)</div><div class='del'>-		gtk_object_unref((GtkObject *)source);</div><div class='del'>-</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'>-		CamelDataWrapper *bodypart;</div><div class='del'>-</div><div class='del'>-#warning This should use a camel-mime-multipart</div><div class='del'>-		d(printf("Creating multi-part\n"));</div><div class='del'>-		content = (CamelDataWrapper *)camel_multipart_new();</div><div class='del'>-</div><div class='del'>-		/* FIXME: use the real boundary? */</div><div class='del'>-		camel_multipart_set_boundary((CamelMultipart *)content, NULL);</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'>-			gtk_object_unref ((GtkObject *)bodypart);</div><div class='del'>-		}</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'>-#warning there just has got to be a better way ... to transfer the mime-type to the datawrapper</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'>-		gtk_object_unref ((GtkObject *)content);</div><div class='del'>-	}</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 1e1c3655aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-part-utils.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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-#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 ab4c44b82f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-part.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,716 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include "gmime-content-field.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include "camel-mime-part-utils.h"</div><div class='del'>-#include &lt;ctype.h&gt;</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-exception.h"</div><div class='del'>-</div><div class='del'>-#define d(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_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'>-</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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-/* from GtkObject */</div><div class='del'>-static void            finalize (GtkObject *object);</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'>-</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'>-</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-Type", (gpointer)HEADER_CONTENT_TYPE);</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_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'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_data_wrapper_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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;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'>-	gtk_object_class-&gt;finalize                    = finalize;</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         = gmime_content_field_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_languages    = NULL;</div><div class='del'>-	camel_mime_part-&gt;encoding             = CAMEL_MIME_PART_ENCODING_DEFAULT;</div><div class='del'>-</div><div class='del'>-	camel_mime_part-&gt;temp_message_buffer  = NULL;	</div><div class='del'>-	camel_mime_part-&gt;content_input_stream = 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'>-GtkType</div><div class='del'>-camel_mime_part_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_mime_part_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_mime_part_type)	{</div><div class='del'>-		GtkTypeInfo camel_mime_part_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMimePart",</div><div class='del'>-			sizeof (CamelMimePart),</div><div class='del'>-			sizeof (CamelMimePartClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mime_part_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mime_part_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'>-		camel_mime_part_type = gtk_type_unique (camel_medium_get_type (), &amp;camel_mime_part_info);</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'>-static void           </div><div class='del'>-finalize (GtkObject *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'>-	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) gmime_content_field_unref (mime_part-&gt;content_type);</div><div class='del'>-	if (mime_part-&gt;temp_message_buffer) g_byte_array_free (mime_part-&gt;temp_message_buffer, TRUE);</div><div class='del'>-</div><div class='del'>-	if (mime_part-&gt;content_input_stream) gtk_object_unref (GTK_OBJECT (mime_part-&gt;content_input_stream));</div><div class='del'>-</div><div class='del'>-	header_raw_clear(&amp;mime_part-&gt;headers);</div><div class='del'>-</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'>-</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'>-	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'>-	/* FIXMME: MUST check fields for validity before adding them! */</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'>-		text = header_decode_string(header_value);</div><div class='del'>-		g_free(mime_part-&gt;description);</div><div class='del'>-		mime_part-&gt;description = text;</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'>-		text = header_msgid_decode(header_value);</div><div class='del'>-		g_free(mime_part-&gt;content_id);</div><div class='del'>-		mime_part-&gt;content_id = text;</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_TYPE: </div><div class='del'>-		gmime_content_field_construct_from_string (mime_part-&gt;content_type, 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'>-</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 = (CamelMimePart *)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 = (CamelMimePart *)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'>-	/* FIXMME: MUST check fields for validity before adding them! */</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'>-</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'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Description", description);</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'>-	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'>-</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'>-		return header_param(mime_part-&gt;disposition-&gt;params, "filename");</div><div class='del'>-	return NULL;</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'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID",</div><div class='del'>-				 contentid);</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-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'>-GMimeContentField *</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'>-	GMimeContentField *object_content_field;</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_field = camel_data_wrapper_get_mime_type_field (content);</div><div class='del'>-	if (mime_part-&gt;content_type &amp;&amp;</div><div class='del'>-	    (mime_part-&gt;content_type != object_content_field)) {</div><div class='del'>-		char *txt;</div><div class='del'>-</div><div class='del'>-		txt = header_content_type_format(object_content_field?object_content_field-&gt;content_type:NULL);</div><div class='del'>-		camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-					 "Content-Type", 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_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'>-	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'>-#warning content-languages should be stored as a header</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'>-		while (h) {</div><div class='del'>-			count = camel_stream_printf(stream, "%s%s%s\n", h-&gt;name, isspace(h-&gt;value[0]) ? ":" : ": ", h-&gt;value);</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'>-</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'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (filter) {</div><div class='del'>-			filter_stream = camel_stream_filter_new_with_stream(stream);</div><div class='del'>-			if (!strcasecmp(mp-&gt;content_type-&gt;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'>-				camel_stream_filter_add(filter_stream, crlf);</div><div class='del'>-				gtk_object_unref((GtkObject *)crlf);</div><div class='del'>-			}</div><div class='del'>-			camel_stream_filter_add(filter_stream, filter);</div><div class='del'>-			gtk_object_unref((GtkObject *)filter);</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'>-		count = camel_data_wrapper_write_to_stream (content, stream);</div><div class='del'>-		if (filter_stream) {</div><div class='del'>-			camel_stream_flush((CamelStream *)filter_stream);</div><div class='del'>-			gtk_object_unref((GtkObject *)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'>-	} else {</div><div class='del'>-		g_warning("No content for medium, nothing to write");</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'>-	char *buf;</div><div class='del'>-	int len;</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'>-		gmime_content_field_construct_from_string (dw-&gt;content_type, "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'>-		while (headers) {</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'>-		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'>-#warning "Need to work out how to detect a (fatally) bad parse in the parser"</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'>-	gtk_object_unref((GtkObject *)mp);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding)</div><div class='del'>-{</div><div class='del'>-	switch (encoding) {</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_DEFAULT:</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_7BIT:</div><div class='del'>-		return "7bit";</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_8BIT:</div><div class='del'>-		return "8bit";</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_BASE64:</div><div class='del'>-		return "base64";</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:</div><div class='del'>-		return "quoted-printable";</div><div class='del'>-	default:</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'>-</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'>-	if (string == NULL)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_DEFAULT;</div><div class='del'>-	else if (strcasecmp (string, "7bit") == 0)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_7BIT;</div><div class='del'>-	else if (strcasecmp (string, "8bit") == 0)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-	else if (strcasecmp (string, "base64") == 0)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-	else if (strcasecmp (string, "quoted-printable") == 0)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-	else</div><div class='del'>-		/* FIXME?  Spit a warning?  */</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 *)gtk_object_new (CAMEL_MIME_PART_TYPE, NULL);</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'>-		gtk_object_unref (GTK_OBJECT (stream));</div><div class='del'>-		camel_medium_set_content_object (medium, dw);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dw));</div><div class='del'>-	} else {</div><div class='del'>-		if (medium-&gt;content)</div><div class='del'>-			gtk_object_unref (GTK_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 00a7bec876..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-part.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; 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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)     (GTK_CHECK_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))</div><div class='del'>-#define CAMEL_MIME_PART_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))</div><div class='del'>-#define CAMEL_IS_MIME_PART(o)    (GTK_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))</div><div class='del'>-</div><div class='del'>-</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_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'>-	/* All fields here are -** PRIVATE **- */ </div><div class='del'>-	gchar *description;</div><div class='del'>-	CamelMimeDisposition *disposition;</div><div class='del'>-	gchar *content_id;</div><div class='del'>-	gchar *content_MD5;</div><div class='del'>-	GList *content_languages;</div><div class='del'>-	CamelMimePartEncodingType encoding;</div><div class='del'>-	</div><div class='del'>-	GByteArray *temp_message_buffer;</div><div class='del'>-	GMimeContentField *content_type;</div><div class='del'>-	CamelStream *content_input_stream;</div><div class='del'>-</div><div class='del'>-	struct _header_raw *headers; /* mime headers */</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 Gtk function */</div><div class='del'>-GtkType 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_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'>-GMimeContentField *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 85016ed245..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2446 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-</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;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;unicode.h&gt;</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'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-utils.h"</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 warnings ... */</div><div class='del'>-#define w(x) 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'>-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 char camel_mime_special_table[256] = {</div><div class='del'>-	  5,  5,  5,  5,  5,  5,  5,  5,  5,167,  7,  5,  5, 39,  5,  5,</div><div class='del'>-	  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,</div><div class='del'>-	178,128,140,128,128,128,128,128,140,140,128,128,140,128,136,132,</div><div class='del'>-	128,128,128,128,128,128,128,128,128,128,204,140,140,  4,140,132,</div><div class='del'>-	140,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,</div><div class='del'>-	128,128,128,128,128,128,128,128,128,128,128,172,172,172,128,128,</div><div class='del'>-	128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,</div><div class='del'>-	128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,  5,</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 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'>-/*</div><div class='del'>-  if any of these change, then the tables above should be regenerated</div><div class='del'>-  by compiling this with -DBUILD_TABLE, and running.</div><div class='del'>-</div><div class='del'>-  gcc -o buildtable `glib-config --cflags --libs` -DBUILD_TABLE camel-mime-utils.c</div><div class='del'>-  ./buildtable</div><div class='del'>-</div><div class='del'>-*/</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_COLON	= 1&lt;&lt;6,	/* rather wasteful of space ... */</div><div class='del'>-	IS_QPSAFE	= 1&lt;&lt;7</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|IS_COLON)) == 0)</div><div class='del'>-#define is_qpsafe(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_QPSAFE) != 0)</div><div class='del'>-</div><div class='del'>-/* only needs to be run to rebuild the tables above */</div><div class='del'>-#ifdef BUILD_TABLE</div><div class='del'>-</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'>-</div><div class='del'>-static void</div><div class='del'>-header_init_bits(unsigned char bit, unsigned char bitcopy, int remove, unsigned char *vals, int len)</div><div class='del'>-{</div><div class='del'>-	int i;</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++) camel_mime_special_table[i] = 0;</div><div class='del'>-	for (i=0;i&lt;32;i++) camel_mime_special_table[i] |= IS_CTRL;</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'>-	camel_mime_special_table[':'] = IS_COLON;</div><div class='del'>-	header_init_bits(IS_LWSP, 0, 0, CHARS_LWSP, sizeof(CHARS_LWSP)-1);</div><div class='del'>-	header_init_bits(IS_TSPECIAL, IS_CTRL, 0, CHARS_TSPECIAL, sizeof(CHARS_TSPECIAL)-1);</div><div class='del'>-	header_init_bits(IS_SPECIAL, 0, 0, CHARS_SPECIAL, sizeof(CHARS_SPECIAL)-1);</div><div class='del'>-	header_init_bits(IS_DSPECIAL, 0, FALSE, CHARS_DSPECIAL, sizeof(CHARS_DSPECIAL)-1);</div><div class='del'>-	for (i=0;i&lt;256;i++) if ((i&gt;=33 &amp;&amp; i&lt;=60) || (i&gt;=62 &amp;&amp; i&lt;=126) || i==32 || i==9) camel_mime_special_table[i] |= IS_QPSAFE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	void run_test(void);</div><div class='del'>-</div><div class='del'>-	header_decode_init();</div><div class='del'>-	base64_init();</div><div class='del'>-</div><div class='del'>-	printf("static unsigned char camel_mime_special_table[256] = {\n\t");</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		printf("%3d,", camel_mime_special_table[i]);</div><div class='del'>-		if ((i&amp;15) == 15) {</div><div class='del'>-			printf("\n");</div><div class='del'>-			if (i!=255) {</div><div class='del'>-				printf("\t");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printf("};\n");</div><div class='del'>-</div><div class='del'>-	printf("static unsigned char camel_mime_base64_rank[256] = {\n\t");</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		printf("%3d,", camel_mime_base64_rank[i]);</div><div class='del'>-		if ((i&amp;15) == 15) {</div><div class='del'>-			printf("\n");</div><div class='del'>-			if (i!=255) {</div><div class='del'>-				printf("\t");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printf("};\n");</div><div class='del'>-</div><div class='del'>-	run_test();</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='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'>-int</div><div class='del'>-base64_encode_close(unsigned char *in, int inlen, 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, outptr, state, save);</div><div class='del'>-</div><div class='del'>-	c1 = ((char *)save)[1];</div><div class='del'>-	c2 = ((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'>-		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'>-	*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'>-int</div><div class='del'>-base64_encode_step(unsigned char *in, int len, 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, its 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 ((++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'>-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'>-int</div><div class='del'>-quoted_encode_close(unsigned char *in, int 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'>-</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'>-	/* hmm, not sure if this should really be added here, we dont want</div><div class='del'>-	   to add it to the content, afterall ...? */</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'>-  FIXME: does not handle trailing spaces/tabs before end of line</div><div class='del'>-*/</div><div class='del'>-int</div><div class='del'>-quoted_encode_step(unsigned char *in, int len, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr, *inend;</div><div class='del'>-	unsigned char c;</div><div class='del'>-	register int sofar = *state;</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 (is_qpsafe(c)) {</div><div class='del'>-				/* check for soft line-break */</div><div class='del'>-			if ((++sofar)&gt;74) {</div><div class='del'>-				*outptr++='=';</div><div class='del'>-				*outptr++='\n';</div><div class='del'>-				sofar = 1;</div><div class='del'>-			}</div><div class='del'>-			*outptr++=c;</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'>-			}</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'>-	*state = sofar;</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'>-int</div><div class='del'>-quoted_decode_step(unsigned char *in, int 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'>-				/* FIXME: use a specials table to avoid 3 comparisons for the common case */</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</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-quoted_decode(const unsigned char *in, int 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 -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* rfc2047 version of quoted-printable */</div><div class='del'>-static int</div><div class='del'>-quoted_encode(const unsigned char *in, int len, unsigned char *out)</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 (is_qpsafe(c) &amp;&amp; !(c=='_' || c=='?')) {</div><div class='del'>-			if (c==' ')</div><div class='del'>-				c='_';</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'>-	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 =='(') {</div><div class='del'>-		while (is_lwsp(*inptr)) {</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)) {</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, int 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'>-	char *encname;</div><div class='del'>-	int tmplen;</div><div class='del'>-	int 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 *inbuf, *outbuf;</div><div class='del'>-	int inlen, outlen;</div><div class='del'>-	unicode_iconv_t ic;</div><div class='del'>-</div><div class='del'>-	d(printf("decoding '%.*s'\n", len, in));</div><div class='del'>-</div><div class='del'>-	/* just make sure we're not passed shit */</div><div class='del'>-	if (len&lt;7</div><div class='del'>-	    || !(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'>-	inptr = memchr(inptr, '?', inend-inptr);</div><div class='del'>-	if (inptr!=NULL</div><div class='del'>-	    &amp;&amp; inptr&lt;inend+2</div><div class='del'>-	    &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'>-			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'>-		}</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'>-			encname[tmplen]=0;</div><div class='del'>-			memcpy(encname, in+2, tmplen);</div><div class='del'>-</div><div class='del'>-			inbuf = decword;</div><div class='del'>-</div><div class='del'>-			outlen = inlen*6;</div><div class='del'>-			outbase = alloca(outlen);</div><div class='del'>-			outbuf = outbase;</div><div class='del'>-</div><div class='del'>-			/* TODO: Should this cache iconv converters? */</div><div class='del'>-			ic = unicode_iconv_open("iso-8859-1", encname);</div><div class='del'>-			if (ic != (unicode_iconv_t)-1) {</div><div class='del'>-				ret = unicode_iconv(ic, (const char **)&amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-				unicode_iconv_close(ic);</div><div class='del'>-				if (ret&gt;=0) {</div><div class='del'>-					*outbuf = 0;</div><div class='del'>-					decoded = g_strdup(outbase);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("Cannot decode charset, header display may be corrupt: %s: %s", encname, strerror(errno)));</div><div class='del'>-				/* TODO: Should this do this, or just leave the encoded strings? */</div><div class='del'>-				decword[inlen] = 0;</div><div class='del'>-				decoded = g_strdup(decword);</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, int 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'>-/* decodes a simple text, rfc822 */</div><div class='del'>-static char *</div><div class='del'>-header_decode_text(const char *in, int inlen)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-	const char *inend = in+inlen;</div><div class='del'>-	char *encstart, *encend;</div><div class='del'>-	char *decword;</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	while ( (encstart = strstr(inptr, "=?"))</div><div class='del'>-		&amp;&amp; (encend = strstr(encstart+2, "?=")) ) {</div><div class='del'>-</div><div class='del'>-		decword = rfc2047_decode_word(encstart, encend-encstart+2);</div><div class='del'>-		if (decword) {</div><div class='del'>-			out = g_string_append_len(out, inptr, encstart-inptr);</div><div class='del'>-			out = g_string_append_len(out, decword, strlen(decword));</div><div class='del'>-			free(decword);</div><div class='del'>-		} else {</div><div class='del'>-			out = g_string_append_len(out, inptr, encend-inptr+2);</div><div class='del'>-		}</div><div class='del'>-		inptr = encend+2;</div><div class='del'>-	}</div><div class='del'>-	out = g_string_append_len(out, inptr, inend-inptr);</div><div class='del'>-</div><div class='del'>-	encstart = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-</div><div class='del'>-	return encstart;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_decode_string(const char *in)</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));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *encoding_map[] = {</div><div class='del'>-	"US-ASCII",</div><div class='del'>-	"ISO-8859-1",</div><div class='del'>-	"UTF-8"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* FIXME: needs a way to cache iconv opens for different charsets? */</div><div class='del'>-static</div><div class='del'>-char *rfc2047_encode_word(const char *in, int len, char *type)</div><div class='del'>-{</div><div class='del'>-	unicode_iconv_t ic;</div><div class='del'>-	char *buffer, *out, *ascii;</div><div class='del'>-	size_t inlen, outlen, enclen;</div><div class='del'>-</div><div class='del'>-	d(printf("Converting '%.*s' to %s\n", len, in, type));</div><div class='del'>-</div><div class='del'>-	/* convert utf8-&gt;encoding */</div><div class='del'>-	outlen = len*6;</div><div class='del'>-	buffer = alloca(outlen);</div><div class='del'>-	inlen = len;</div><div class='del'>-	out = buffer;</div><div class='del'>-</div><div class='del'>-	/* if we can't convert from utf-8, just encode as utf-8 */</div><div class='del'>-	if (!strcasecmp(type, "UTF-8")</div><div class='del'>-	    || (ic = unicode_iconv_open(type, "UTF-8")) == (unicode_iconv_t)-1) {</div><div class='del'>-		memcpy(buffer, in, len);</div><div class='del'>-		out = buffer+len;</div><div class='del'>-		type = "UTF-8";</div><div class='del'>-	} else {</div><div class='del'>-		if (unicode_iconv(ic, &amp;in, &amp;inlen, &amp;out, &amp;outlen) == -1) {</div><div class='del'>-			w(g_warning("Conversion problem: conversion truncated: %s", strerror(errno)));</div><div class='del'>-		}</div><div class='del'>-		unicode_iconv_close(ic);</div><div class='del'>-	}</div><div class='del'>-	enclen = out-buffer;</div><div class='del'>-</div><div class='del'>-	/* now create qp version */</div><div class='del'>-	ascii = alloca(enclen*3 + strlen(type) + 8);</div><div class='del'>-	out = ascii;</div><div class='del'>-	/* should determine which encoding is smaller, and use that? */</div><div class='del'>-	out += sprintf(out, "=?%s?Q?", type);</div><div class='del'>-	out += quoted_encode(buffer, enclen, out);</div><div class='del'>-	sprintf(out, "?=");</div><div class='del'>-</div><div class='del'>-	d(printf("converted = %s\n", ascii));</div><div class='del'>-	return g_strdup(ascii);</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'>-	GString *out;</div><div class='del'>-	const unsigned char *inptr = in, *start;</div><div class='del'>-	int encoding;</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'>-	/* 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'>-	/* FIXME: Make sure a converted word is less than the encoding size */</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	inptr = in;</div><div class='del'>-	encoding = 0;</div><div class='del'>-	start = inptr;</div><div class='del'>-	while (inptr &amp;&amp; *inptr) {</div><div class='del'>-		unicode_char_t c;</div><div class='del'>-		const char *newinptr;</div><div class='del'>-		newinptr = unicode_get_utf8(inptr, &amp;c);</div><div class='del'>-		if (newinptr == NULL) {</div><div class='del'>-			w(g_warning("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s", (inptr-in), inptr[0], in));</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		inptr = newinptr;</div><div class='del'>-		if (unicode_isspace(c)) {</div><div class='del'>-			if (encoding == 0) {</div><div class='del'>-				out = g_string_append_len(out, start, inptr-start);</div><div class='del'>-			} else {</div><div class='del'>-				char *text = rfc2047_encode_word(start, inptr-start-1, encoding_map[encoding]);</div><div class='del'>-				out = g_string_append(out, text);</div><div class='del'>-				out = g_string_append_c(out, c);</div><div class='del'>-				g_free(text);</div><div class='del'>-			}</div><div class='del'>-			start = inptr;</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'>-		} 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'>-	if (inptr-start) {</div><div class='del'>-		if (encoding == 0) {</div><div class='del'>-			out = g_string_append_len(out, start, inptr-start);</div><div class='del'>-		} else {</div><div class='del'>-			char *text = rfc2047_encode_word(start, inptr-start, encoding_map[encoding]);</div><div class='del'>-			out = g_string_append(out, text);</div><div class='del'>-			g_free(text);</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'>-	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'>-	int 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'>-/* shoudl this return -1 for no int? */</div><div class='del'>-static 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'>-static int</div><div class='del'>-header_decode_param(const char **in, char **paramp, char **valuep)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *param, *value=NULL;</div><div class='del'>-</div><div class='del'>-	param = decode_token(&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'>-		value = header_decode_value(&amp;inptr);</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'>-	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);</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 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) {</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(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(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'>-</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')) {	/* ',' 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;</div><div class='del'>-</div><div class='del'>-			text = header_decode_string(pre);</div><div class='del'>-			name = g_string_append(name, text);</div><div class='del'>-			g_free(pre);</div><div class='del'>-			g_free(text);</div><div class='del'>-</div><div class='del'>-			/* rfc_decode(pre) */</div><div class='del'>-			pre = header_decode_word(&amp;inptr);</div><div class='del'>-			if (pre)</div><div class='del'>-				name = g_string_append_c(name, ' ');</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'>-			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'>-		if (pre) {</div><div class='del'>-			addr = g_string_append_c(addr, '.');</div><div class='del'>-			addr = g_string_append(addr, pre);</div><div class='del'>-		}</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'>-		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'>-		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) { /* check for comment after address */</div><div class='del'>-		char *text, *tmp;</div><div class='del'>-		const char *comment = inptr;</div><div class='del'>-</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (inptr-comment &gt; 3) { /* just guess ... */</div><div class='del'>-			tmp = g_strndup(comment, inptr-comment);</div><div class='del'>-			text = header_decode_string(tmp);</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'>-	*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'>-/* 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'>-	const char *inptr = in, *intmp;</div><div class='del'>-	struct _header_references *head = NULL, *node;</div><div class='del'>-	char *id, *last;</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'>-	while (*inptr == '&lt;') {</div><div class='del'>-		last = inptr;</div><div class='del'>-		id = header_msgid_decode_internal(&amp;inptr);</div><div class='del'>-		if (id) {</div><div class='del'>-			node = g_malloc(sizeof(*node));</div><div class='del'>-			node-&gt;next = head;</div><div class='del'>-			head = node;</div><div class='del'>-			node-&gt;id = id;</div><div class='del'>-		}</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-	} while (*inptr == '&lt;' &amp;&amp; last != 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_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'>-#warning header_to_decode needs to return some structure</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 {</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_param_list_decode(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'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	while (*inptr == ';') {</div><div class='del'>-		char *param, *value;</div><div class='del'>-		struct _header_param *p;</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;param, &amp;value) != 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		p = g_malloc(sizeof(*p));</div><div class='del'>-		p-&gt;name = param;</div><div class='del'>-		p-&gt;value = value;</div><div class='del'>-		p-&gt;next = NULL;</div><div class='del'>-		if (head == NULL)</div><div class='del'>-			head = p;</div><div class='del'>-		if (tail)</div><div class='del'>-			tail-&gt;next = p;</div><div class='del'>-		tail = p;</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-	}</div><div class='del'>-	*in = inptr;</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static 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 len = out-&gt;len;</div><div class='del'>-	while (p) {</div><div class='del'>-		int here = out-&gt;len;</div><div class='del'>-		if (len+strlen(p-&gt;name)+strlen(p-&gt;value)&gt;60) {</div><div class='del'>-			out = g_string_append(out, "\n\t");</div><div class='del'>-			len = 0;</div><div class='del'>-		}</div><div class='del'>-		/* FIXME: format the value properly */</div><div class='del'>-		g_string_sprintfa(out, " ; %s=\"%s\"", p-&gt;name, p-&gt;value);</div><div class='del'>-		len += (out-&gt;len - here);</div><div class='del'>-		p = p-&gt;next;</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_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_param_list_decode(&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_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 *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_param_list_decode(&amp;inptr);</div><div class='del'>-	return d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void 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'>-void 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 *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, its 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'>-				w(g_warning("day not followed by ',' its probably a broken TradeClient, so we'll ignore its date entirely"));</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'>-	}</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;100) {</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'>-/* 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'>-	int 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))</div><div class='del'>-		in++;</div><div class='del'>-	fieldlen = in-header;</div><div class='del'>-	while (is_lwsp(*in))</div><div class='del'>-		in++;</div><div class='del'>-	if (fieldlen == 0 || *in != ':') {</div><div class='del'>-		printf("Invalid header line: '%s'\n", header);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	in++;</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'>-</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'>-static void</div><div class='del'>-header_address_list_format_append(GString *out, 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'>-#warning needs to rfc2047 encode address phrase</div><div class='del'>-			/* FIXME: 2047 encoding?? */</div><div class='del'>-			if (a-&gt;name &amp;&amp; *a-&gt;name)</div><div class='del'>-				g_string_sprintfa(out, "\"%s\" &lt;%s&gt;", a-&gt;name, 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'>-			break;</div><div class='del'>-		case HEADER_ADDRESS_GROUP:</div><div class='del'>-			text = header_encode_string(a-&gt;name);</div><div class='del'>-			g_string_sprintfa(out, "%s:\n ", text);</div><div class='del'>-			header_address_list_format_append(out, a-&gt;v.members);</div><div class='del'>-			g_string_sprintfa(out, ";");</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'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: need a 'display friendly' version, as well as a 'rfc friendly' version? */</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_format_append(out, 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'>-#ifdef BUILD_TABLE</div><div class='del'>-</div><div class='del'>-/* for debugging tests */</div><div class='del'>-/* should also have some regression tests somewhere */</div><div class='del'>-</div><div class='del'>-void run_test(void)</div><div class='del'>-{</div><div class='del'>-	char *to = "gnome hacker dudes: license-discuss@opensource.org,</div><div class='del'>-        \"Richard M. Stallman\" &lt;rms@gnu.org&gt;,</div><div class='del'>-        Barry Chester &lt;barry_che@antdiv.gov.au&gt;,</div><div class='del'>-        Michael Zucchi &lt;zucchi.michael(this (is a nested) comment)@zedzone.mmc.com.au&gt;,</div><div class='del'>-        Miguel de Icaza &lt;miguel@gnome.org&gt;;,</div><div class='del'>-	zucchi@zedzone.mmc.com.au, \"Foo bar\" &lt;zed@zedzone&gt;,</div><div class='del'>-	&lt;frob@frobzone&gt;";</div><div class='del'>-</div><div class='del'>-	header_to_decode(to);</div><div class='del'>-</div><div class='del'>-	header_mime_decode("1.0");</div><div class='del'>-	header_mime_decode("1.3 (produced by metasend V1.0)");</div><div class='del'>-	header_mime_decode("(produced by metasend V1.0) 5.2");</div><div class='del'>-	header_mime_decode("7(produced by metasend 1.0) . (produced by helix/send/1.0) 9 . 5");</div><div class='del'>-	header_mime_decode("3.");</div><div class='del'>-	header_mime_decode(".");</div><div class='del'>-	header_mime_decode(".5");</div><div class='del'>-	header_mime_decode("c.d");</div><div class='del'>-	header_mime_decode("");</div><div class='del'>-</div><div class='del'>-	header_msgid_decode(" &lt;\"L3x2i1.0.Nm5.Xd-Wu\"@lists.redhat.com&gt;");</div><div class='del'>-	header_msgid_decode("&lt;200001180446.PAA02065@beaker.htb.com.au&gt;");</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* BUILD_TABLE */</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 5f715243d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-mime-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#include &lt;time.h&gt;</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'>-/* 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'>-char *header_address_list_format(struct _header_address *a);</div><div class='del'>-</div><div class='del'>-/* structured header prameters */</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_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'>-</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 *ofset);</div><div class='del'>-const char *header_raw_find_next(struct _header_raw **list, const char *name, int *ofset, 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_clear(struct _header_raw **list);</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'>-/* decode/encode a string type, like a subject line */</div><div class='del'>-char *header_decode_string(const char *in);</div><div class='del'>-char *header_encode_string(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'>-/* decode a References header */</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'>-</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'>-int base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save);</div><div class='del'>-</div><div class='del'>-int base64_encode_step(unsigned char *in, int len, unsigned char *out, int *state, int *save);</div><div class='del'>-int base64_encode_close(unsigned char *in, int inlen, unsigned char *out, int *state, int *save);</div><div class='del'>-</div><div class='del'>-int quoted_decode_step(unsigned char *in, int len, unsigned char *out, int *savestate, int *saveme);</div><div class='del'>-</div><div class='del'>-int quoted_encode_step(unsigned char *in, int len, unsigned char *out, int *state, int *save);</div><div class='del'>-int quoted_encode_close(unsigned char *in, int len, unsigned char *out, int *state, int *save);</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 3ba3ee9efb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-movemail.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-movemail.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,500 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</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'>-</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'>-#define d(x)</div><div class='del'>-</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_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter);</div><div class='del'>-static int camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes);</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: 1 if mail was copied, 0 if the source file contained</div><div class='del'>- * no mail, -1 if an error occurred.</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'>-	gboolean locked, error;</div><div class='del'>-	int sfd, dfd, tmpfd;</div><div class='del'>-	char *locktmpfile, *lockfile;</div><div class='del'>-	struct stat st;</div><div class='del'>-	time_t now, timeout;</div><div class='del'>-	int nread, nwrote;</div><div class='del'>-	char buf[BUFSIZ];</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'>-			return 0;</div><div class='del'>-</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not check mail file %s: %s",</div><div class='del'>-				      source, g_strerror (errno));</div><div class='del'>-		return -1;</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'>-	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, g_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, g_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'>-	/* Create the unique lock file. */</div><div class='del'>-	locktmpfile = g_strdup_printf ("%s.lock.XXXXXX", source);</div><div class='del'>-#ifdef HAVE_MKSTEMP</div><div class='del'>-	tmpfd = mkstemp (locktmpfile);</div><div class='del'>-#else</div><div class='del'>-	if (mktemp (locktmpfile)) {</div><div class='del'>-		tmpfd = open (locktmpfile, O_RDWR | O_CREAT | O_EXCL,</div><div class='del'>-			      S_IRUSR | S_IWUSR);</div><div class='del'>-	} else</div><div class='del'>-		tmpfd = -1;</div><div class='del'>-#endif</div><div class='del'>-	if (tmpfd == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not create lock file "</div><div class='del'>-				      "for %s: %s", source, g_strerror (errno));</div><div class='del'>-		close (sfd);</div><div class='del'>-		close (dfd);</div><div class='del'>-		unlink (dest);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	close (tmpfd);</div><div class='del'>-</div><div class='del'>-	lockfile = g_strdup_printf ("%s.lock", source);</div><div class='del'>-	locked = FALSE;</div><div class='del'>-	time (&amp;timeout);</div><div class='del'>-	timeout += 30;</div><div class='del'>-</div><div class='del'>-	/* Loop trying to lock the file for 30 seconds. */</div><div class='del'>-	while (time (&amp;now) &lt; timeout) {</div><div class='del'>-		/* Try to make the lock. */</div><div class='del'>-		if (symlink (locktmpfile, lockfile) == 0) {</div><div class='del'>-			locked = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If we fail for a reason other than that someone</div><div class='del'>-		 * else has the lock, then abort.</div><div class='del'>-		 */</div><div class='del'>-		if (errno != EEXIST) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "Could not create lock "</div><div class='del'>-					      "file for %s: %s", source,</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check the modtime on the lock file. */</div><div class='del'>-		if (stat (lockfile, &amp;st) == -1) {</div><div class='del'>-			/* If the lockfile disappeared, try again. */</div><div class='del'>-			if (errno == ENOENT)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* Some other error. Abort. */</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "Could not test lock "</div><div class='del'>-					      "file for %s: %s", source,</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If the lock file is stale, remove it and try again. */</div><div class='del'>-		if (st.st_mtime &lt; now - 60) {</div><div class='del'>-			unlink (lockfile);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Otherwise, sleep and try again. */</div><div class='del'>-		sleep (5);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!locked) {</div><div class='del'>-		/* Something has gone awry. */</div><div class='del'>-		if (now &gt;= timeout) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "Timed out trying to get "</div><div class='del'>-					      "lock file on %s. Try again "</div><div class='del'>-					      "later.", source);</div><div class='del'>-		}</div><div class='del'>-		g_free (lockfile);</div><div class='del'>-		unlink (locktmpfile);</div><div class='del'>-		g_free (locktmpfile);</div><div class='del'>-		close (sfd);</div><div class='del'>-		close (dfd);</div><div class='del'>-		unlink (dest);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK. We have the file locked now. */</div><div class='del'>-</div><div class='del'>-	/* FIXME: Set a timer to keep the file locked. */</div><div class='del'>-</div><div class='del'>-	error = FALSE;</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'>-					      g_strerror (errno));</div><div class='del'>-			error = TRUE;</div><div class='del'>-			break;</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 "</div><div class='del'>-						      "mail temp file: %s",</div><div class='del'>-						      g_strerror (errno));</div><div class='del'>-				error = TRUE;</div><div class='del'>-				break;</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'>-	/* 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'>-	 * If there is some sort of error, delete the destination file.</div><div class='del'>-	 */</div><div class='del'>-	if (!error) {</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 "</div><div class='del'>-					      "temp file %s: %s", dest,</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			unlink (dest);</div><div class='del'>-			error = TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		close (dfd);</div><div class='del'>-		unlink (dest);</div><div class='del'>-	}</div><div class='del'>-	close (sfd);</div><div class='del'>-</div><div class='del'>-	/* Clean up lock files. */</div><div class='del'>-	unlink (lockfile);</div><div class='del'>-	g_free (lockfile);</div><div class='del'>-	unlink (locktmpfile);</div><div class='del'>-	g_free (locktmpfile);</div><div class='del'>-</div><div class='del'>-	return error ? -1 : 1;</div><div class='del'>-}</div><div class='del'>-</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'>-</div><div class='del'>-#define PRE_SIZE (32)</div><div class='del'>-</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'>-                /* 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'>-		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 sfd, 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'>-	CamelMimeFilterFrom *ffrom;</div><div class='del'>-	int ret = 1;</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'>-		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'>-			/* write out headers, but NOT content-length header */</div><div class='del'>-			solaris_header_write(dfd, camel_mime_parser_headers_raw(mp));</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'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)mp);</div><div class='del'>-	gtk_object_unref((GtkObject *)ffrom);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			      "Error copying "</div><div class='del'>-			      "mail temp file: %s",</div><div class='del'>-			      g_strerror (errno));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)mp);</div><div class='del'>-	gtk_object_unref((GtkObject *)ffrom);</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/camel-movemail.h b/camel/camel-movemail.h<br/>deleted file mode 100644<br/>index ea75c82603..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-movemail.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-movemail.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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 e28c6542bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-multipart.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-multipart.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,488 +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'>-#warning This should be a mostly abstract class, but it is not!</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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "gmime-content-field.h"</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'>-#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'>-#define d(x)</div><div class='del'>-</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'>-						gchar *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                  finalize          (GtkObject *object);</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 (GTK_OBJECT(so)-&gt;klass)</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 (GTK_OBJECT(so)-&gt;klass)</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_multipart_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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'>-</div><div class='del'>-	gtk_object_class-&gt;finalize = finalize;</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'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_multipart_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_multipart_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_multipart_type) {</div><div class='del'>-		GtkTypeInfo camel_multipart_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelMultipart",</div><div class='del'>-			sizeof (CamelMultipart),</div><div class='del'>-			sizeof (CamelMultipartClass),</div><div class='del'>-			(GtkClassInitFunc) camel_multipart_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_multipart_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'>-		camel_multipart_type = gtk_type_unique (camel_data_wrapper_get_type (), &amp;camel_multipart_info);</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'>-	GtkObject *part = GTK_OBJECT (data);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (GtkObject *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'>-	GTK_OBJECT_CLASS (parent_class)-&gt;finalize (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'>- * 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 *)gtk_type_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'>-	gtk_object_ref (GTK_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'>-	gtk_object_ref (GTK_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'>-	gtk_object_unref (GTK_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'>-		gtk_object_unref (GTK_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 gtk_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, gchar *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, 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'>-	gmime_content_field_set_parameter (cdw-&gt;mime_type, "boundary",</div><div class='del'>-					   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, gchar *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 gmime_content_field_get_parameter (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'>-/* 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 &amp;&amp; *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='head'>diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h<br/>deleted file mode 100644<br/>index 709e73e51d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-multipart.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-multipart.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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)     (GTK_CHECK_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))</div><div class='del'>-#define CAMEL_MULTIPART_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))</div><div class='del'>-#define CAMEL_IS_MULTIPART(o)    (GTK_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, gchar *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 Gtk function */</div><div class='del'>-GtkType 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'>-						    gchar *boundary);</div><div class='del'>-const gchar *       camel_multipart_get_boundary   (CamelMultipart *multipart);</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_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 671f0a5559..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-news-address.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-news-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code 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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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'>-static void camel_news_address_init       (CamelNewsAddress *obj);</div><div class='del'>-</div><div class='del'>-static CamelAddressClass *camel_news_address_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_news_address_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'>-			"CamelNewsAddress",</div><div class='del'>-			sizeof (CamelNewsAddress),</div><div class='del'>-			sizeof (CamelNewsAddressClass),</div><div class='del'>-			(GtkClassInitFunc) camel_news_address_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_news_address_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 (camel_address_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'>-camel_news_address_class_init (CamelNewsAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_news_address_parent = gtk_type_class (camel_address_get_type ());</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'>-camel_news_address_init (CamelNewsAddress *obj)</div><div class='del'>-{</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 ( gtk_type_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 e25f907351..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-news-address.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-news-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code 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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#include &lt;camel/camel-address.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_NEWS_ADDRESS(obj)         GTK_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress)</div><div class='del'>-#define CAMEL_NEWS_ADDRESS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_news_address_get_type (), CamelNewsAddressClass)</div><div class='del'>-#define IS_CAMEL_NEWS_ADDRESS(obj)      GTK_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'>-guint		camel_news_address_get_type	(void);</div><div class='del'>-CamelNewsAddress      *camel_news_address_new	(void);</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 3edce10d8a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-object.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-object.c</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'>-/* camel-object.c: 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-object.h"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_object_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	GTK_OBJECT_UNSET_FLAGS (object, GTK_FLOATING);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_object_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_object_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_object_type) {</div><div class='del'>-		GtkTypeInfo camel_object_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelObject",</div><div class='del'>-			sizeof (CamelObject),</div><div class='del'>-			sizeof (CamelObjectClass),</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-			(GtkObjectInitFunc) camel_object_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'>-		camel_object_type = gtk_type_unique (gtk_object_get_type (), &amp;camel_object_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_object_type;</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 2c6b4d0d5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-object.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-object.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#ifndef CAMEL_OBJECT_H</div><div class='del'>-#define CAMEL_OBJECT_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;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_OBJECT_TYPE     (camel_object_get_type ())</div><div class='del'>-#define CAMEL_OBJECT(obj)     (GTK_CHECK_CAST((obj), CAMEL_OBJECT_TYPE, CamelObject))</div><div class='del'>-#define CAMEL_OBJECT_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_OBJECT_TYPE, CamelObjectClass))</div><div class='del'>-#define CAMEL_IS_OBJECT(o)    (GTK_CHECK_TYPE((o), CAMEL_OBJECT_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelObject</div><div class='del'>-{</div><div class='del'>-	GtkObject parent_object;</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'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelObjectClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_object_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 /* CAMEL_OBJECT_H */</div><div class='head'>diff --git a/camel/camel-op-queue.c b/camel/camel-op-queue.c<br/>deleted file mode 100644<br/>index 3e17222f0a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-op-queue.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-op-queue.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-/* MT safe */</div><div class='del'>-</div><div class='del'>- </div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-op-queue.h"</div><div class='del'>-</div><div class='del'>-static GStaticMutex op_queue_mutex = G_STATIC_MUTEX_INIT;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_queue_new: create a new operation queue</div><div class='del'>- * </div><div class='del'>- * Create a new operation queue. </div><div class='del'>- *</div><div class='del'>- * Return value: the newly allcated object</div><div class='del'>- **/</div><div class='del'>-CamelOpQueue *</div><div class='del'>-camel_op_queue_new ()</div><div class='del'>-{</div><div class='del'>-	CamelOpQueue *op_queue;</div><div class='del'>-</div><div class='del'>-	op_queue = g_new (CamelOpQueue, 1);</div><div class='del'>-	op_queue-&gt;ops_tail = NULL;</div><div class='del'>-	op_queue-&gt;ops_head = NULL;</div><div class='del'>-	op_queue-&gt;service_available = TRUE;</div><div class='del'>-</div><div class='del'>-	return op_queue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-camel_op_queue_free (CamelOpQueue *op_queue)</div><div class='del'>-{</div><div class='del'>-	g_list_free (op_queue-&gt;ops_head);	</div><div class='del'>-	g_free (op_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_queue_push_op: Add an operation to the queue</div><div class='del'>- * @queue: queue object</div><div class='del'>- * @op: operation to add</div><div class='del'>- * </div><div class='del'>- * Add an operation to an operation queue. </div><div class='del'>- * The queue is a FIFO queue. </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_op_queue_push_op (CamelOpQueue *queue, CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	g_assert (queue);</div><div class='del'>-	g_static_mutex_lock (&amp;op_queue_mutex);</div><div class='del'>-	if (!queue-&gt;ops_tail) {</div><div class='del'>-		queue-&gt;ops_head = g_list_prepend (NULL, op);</div><div class='del'>-		queue-&gt;ops_tail = queue-&gt;ops_head;</div><div class='del'>-	} else </div><div class='del'>-		queue-&gt;ops_head = g_list_prepend (queue-&gt;ops_head, op);	</div><div class='del'>-	g_static_mutex_unlock (&amp;op_queue_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_queue_pop_op: Pop the next operation pending in the queue</div><div class='del'>- * @queue: queue object</div><div class='del'>- * </div><div class='del'>- * Pop the next operation pending in the queue.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelOp *</div><div class='del'>-camel_op_queue_pop_op (CamelOpQueue *queue)</div><div class='del'>-{</div><div class='del'>-	GList *op_list;</div><div class='del'>-	CamelOp *op;</div><div class='del'>-</div><div class='del'>-	g_assert (queue);</div><div class='del'>-</div><div class='del'>-	g_static_mutex_lock (&amp;op_queue_mutex);</div><div class='del'>-	op_list = queue-&gt;ops_tail;</div><div class='del'>-	if (!op_list) return NULL;</div><div class='del'>-</div><div class='del'>-	queue-&gt;ops_tail = queue-&gt;ops_tail-&gt;prev;</div><div class='del'>-	op = (CamelOp *)op_list-&gt;data;</div><div class='del'>-	g_static_mutex_unlock (&amp;op_queue_mutex);</div><div class='del'>-</div><div class='del'>-	return op;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_queue_run_next_op: run the next pending operation</div><div class='del'>- * @queue: queue object</div><div class='del'>- * </div><div class='del'>- * Run the next pending operation in the queue.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if an operation was launched FALSE if there was no operation pending in the queue.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_op_queue_run_next_op (CamelOpQueue *queue)</div><div class='del'>-{</div><div class='del'>-	CamelOp *op;</div><div class='del'>-</div><div class='del'>-	op = camel_op_queue_pop_op (queue);</div><div class='del'>-	if (!op) 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'>- * camel_op_queue_set_service_availability: set the service availability for an operation queue</div><div class='del'>- * @queue: queue object</div><div class='del'>- * @available: availability flag</div><div class='del'>- * </div><div class='del'>- * set the service availability</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_op_queue_set_service_availability (CamelOpQueue *queue, gboolean available)</div><div class='del'>-{</div><div class='del'>-	g_static_mutex_lock (&amp;op_queue_mutex);</div><div class='del'>-	queue-&gt;service_available = available;</div><div class='del'>-	g_static_mutex_unlock (&amp;op_queue_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_op_queue_get_service_availability: determine if an operation queue service is available </div><div class='del'>- * @queue: queue object</div><div class='del'>- * </div><div class='del'>- * Determine if the service associated to an operation queue is available.</div><div class='del'>- * </div><div class='del'>- * Return value: service availability.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_op_queue_get_service_availability (CamelOpQueue *queue)</div><div class='del'>-{</div><div class='del'>-	gboolean available;</div><div class='del'>-</div><div class='del'>-	g_static_mutex_lock (&amp;op_queue_mutex);</div><div class='del'>-	available = queue-&gt;service_available;</div><div class='del'>-	g_static_mutex_unlock (&amp;op_queue_mutex);</div><div class='del'>-	return available;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-op-queue.h b/camel/camel-op-queue.h<br/>deleted file mode 100644<br/>index 49fdc152d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-op-queue.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-op-queue.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'>-/* </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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-#ifndef CAMEL_OP_QUEUE_H</div><div class='del'>-#define CAMEL_OP_QUEUE_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-marshal-utils.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	GList *ops_head;</div><div class='del'>-	GList *ops_tail;</div><div class='del'>-	gboolean service_available;</div><div class='del'>-</div><div class='del'>-} CamelOpQueue;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelOpQueue *camel_op_queue_new ();</div><div class='del'>-void camel_op_queue_free (CamelOpQueue *op_queue);</div><div class='del'>-void camel_op_queue_push_op (CamelOpQueue *queue, CamelOp *op);</div><div class='del'>-CamelOp *camel_op_queue_pop_op (CamelOpQueue *queue);</div><div class='del'>-gboolean camel_op_queue_run_next_op (CamelOpQueue *queue);</div><div class='del'>-gboolean camel_op_queue_get_service_availability (CamelOpQueue *queue);</div><div class='del'>-void camel_op_queue_set_service_availability (CamelOpQueue *queue, gboolean available);</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_OP_QUEUE_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-provider.c b/camel/camel-provider.c<br/>deleted file mode 100644<br/>index 9b76fc1766..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,153 +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@helixcode.com&gt;</div><div class='del'>- *  Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-/* FIXME: Shouldn't we add a version number to providers ? */</div><div class='del'>-</div><div class='del'>-#include "config.h"</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'>-#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'>-char *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES] = {</div><div class='del'>-	"store",</div><div class='del'>-	"transport"</div><div class='del'>-};</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'>-	FILE *f;</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'>-		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'>-		f = fopen (name, "r");</div><div class='del'>-		if (!f) {</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), f))) {</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'>-			g_hash_table_insert (providers, g_strdup (buf), name);</div><div class='del'>-		}</div><div class='del'>-		fclose (f);</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'>-				      "routine 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='head'>diff --git a/camel/camel-provider.h b/camel/camel-provider.h<br/>deleted file mode 100644<br/>index 58d63a773e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-provider.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-provider.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;camel/camel-types.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'>-#define CAMEL_PROVIDER_IS_REMOTE	(1 &lt;&lt; 0)</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'>-	int flags;</div><div class='del'>-</div><div class='del'>-	GtkType object_types [CAMEL_NUM_PROVIDER_TYPES];</div><div class='del'>-</div><div class='del'>-	GHashTable *service_cache;</div><div class='del'>-	</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'>-#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-seekable-stream.c b/camel/camel-seekable-stream.c<br/>deleted file mode 100644<br/>index 507c69dd48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-stream.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-seekable-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +0,0 @@</div><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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-#include &lt;config.h&gt;</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 (GTK_OBJECT(so)-&gt;klass)</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 = gtk_type_class (camel_stream_get_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'>-GtkType</div><div class='del'>-camel_seekable_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_seekable_stream_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_seekable_stream_type) {</div><div class='del'>-		GtkTypeInfo camel_seekable_stream_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelSeekableStream",</div><div class='del'>-			sizeof (CamelSeekableStream),</div><div class='del'>-			sizeof (CamelSeekableStreamClass),</div><div class='del'>-			(GtkClassInitFunc) camel_seekable_stream_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_seekable_stream_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'>-		camel_seekable_stream_type = gtk_type_unique (camel_stream_get_type (), &amp;camel_seekable_stream_info);</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 f1cd5cdbca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-stream.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-seekable-stream.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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;camel/camel-stream.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'>-</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM_TYPE     (camel_seekable_stream_get_type ())</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM(obj)     (GTK_CHECK_CAST((obj), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStream))</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStreamClass))</div><div class='del'>-#define CAMEL_IS_SEEKABLE_STREAM(o)    (GTK_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 Gtk function */</div><div class='del'>-GtkType 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 4fc5b5d853..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-substream.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-seekable-substream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,284 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</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 (GTK_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'>-static	void	 finalize     (GtkObject *object);</div><div class='del'>-</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_seekable_substream_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_seekable_substream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_seekable_substream_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_seekable_substream_type) {</div><div class='del'>-		GtkTypeInfo camel_seekable_substream_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelSeekableSubstream",</div><div class='del'>-			sizeof (CamelSeekableSubstream),</div><div class='del'>-			sizeof (CamelSeekableSubstreamClass),</div><div class='del'>-			(GtkClassInitFunc) camel_seekable_substream_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_seekable_substream_type = gtk_type_unique (camel_seekable_stream_get_type (), &amp;camel_seekable_substream_info);</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'>-static void</div><div class='del'>-finalize (GtkObject *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'>-		gtk_object_unref (GTK_OBJECT (seekable_substream-&gt;parent_stream));</div><div class='del'>-</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'>- * 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 = gtk_type_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'>-	gtk_object_ref (GTK_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 =</div><div class='del'>-		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)</div><div class='del'>-		== 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 =</div><div class='del'>-		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 - its 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'>-	/* NOT VALID ON SEEKABLE SUBSTREAM */</div><div class='del'>-	/* Well, its entirely valid, just not implemented */</div><div class='del'>-	g_warning ("CamelSeekableSubstream:: seekable substream doesn't "</div><div class='del'>-		   "have a write method yet?\n");</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'>-	/* NOT VALID ON SEEKABLE SUBSTREAM */</div><div class='del'>-	g_warning ("CamelSeekableSubstream:: seekable substream doesn't "</div><div class='del'>-		   "have a flush method\n");</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_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 =</div><div class='del'>-		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 =</div><div class='del'>-		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'>-		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'>-			return -1;</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 721d33380a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-substream.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-seekable-substream.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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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)       (GTK_CHECK_CAST((obj), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstream))</div><div class='del'>-#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k)   (GTK_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass))</div><div class='del'>-#define CAMEL_IS_SEEKABLE_SUBSTREAM(o)      (GTK_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 Gtk function */</div><div class='del'>-GtkType 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 1efcafcfe8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-service.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-service.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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</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'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static gboolean service_connect(CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean service_disconnect(CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean is_connected (CamelService *service);</div><div class='del'>-static GList *  query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static void     free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-static void     finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static gboolean check_url (CamelService *service, CamelException *ex);</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_service_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</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;is_connected = is_connected;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	camel_service_class-&gt;free_auth_types = free_auth_types;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_service_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_service_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_service_type) {</div><div class='del'>-		GtkTypeInfo camel_service_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelService",</div><div class='del'>-			sizeof (CamelService),</div><div class='del'>-			sizeof (CamelServiceClass),</div><div class='del'>-			(GtkClassInitFunc) camel_service_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_service_type = gtk_type_unique (camel_object_get_type (),</div><div class='del'>-						      &amp;camel_service_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_service_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelService *camel_service = CAMEL_SERVICE (object);</div><div class='del'>-</div><div class='del'>-	if (camel_service-&gt;url)</div><div class='del'>-		camel_url_free (camel_service-&gt;url);</div><div class='del'>-	if (camel_service-&gt;session)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (camel_service-&gt;session));</div><div class='del'>-</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 gboolean</div><div class='del'>-check_url (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *url_string;</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url_flags &amp; CAMEL_SERVICE_URL_NEED_USER &amp;&amp;</div><div class='del'>-	    (service-&gt;url-&gt;user == NULL || service-&gt;url-&gt;user[0] == '\0')) {</div><div class='del'>-		url_string = camel_url_to_string (service-&gt;url, FALSE);</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 FALSE;</div><div class='del'>-	} else if (service-&gt;url_flags &amp; CAMEL_SERVICE_URL_NEED_HOST &amp;&amp;</div><div class='del'>-		   (service-&gt;url-&gt;host == NULL || service-&gt;url-&gt;host[0] == '\0')) {</div><div class='del'>-		url_string = camel_url_to_string (service-&gt;url, FALSE);</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 FALSE;</div><div class='del'>-	} else if (service-&gt;url_flags &amp; CAMEL_SERVICE_URL_NEED_PATH &amp;&amp;</div><div class='del'>-		   (service-&gt;url-&gt;path == NULL || service-&gt;url-&gt;path[0] == '\0')) {</div><div class='del'>-		url_string = camel_url_to_string (service-&gt;url, FALSE);</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 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'>- * camel_service_new: create a new CamelService or subtype</div><div class='del'>- * @type: the GtkType of the class to create</div><div class='del'>- * @session: the session for the service</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'>- * Creates a new CamelService (or one of its subtypes), initialized</div><div class='del'>- * with the given parameters.</div><div class='del'>- *</div><div class='del'>- * Return value: the CamelService, or NULL.</div><div class='del'>- **/</div><div class='del'>-CamelService *</div><div class='del'>-camel_service_new (GtkType type, CamelSession *session, CamelURL *url,</div><div class='del'>-		   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'>-</div><div class='del'>-	service = CAMEL_SERVICE (gtk_object_new (type, NULL));</div><div class='del'>-	service-&gt;url = url;</div><div class='del'>-	if (!url-&gt;empty &amp;&amp; !check_url (service, ex)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (service));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	service-&gt;session = session;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (session));</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'>-static gboolean</div><div class='del'>-service_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	service-&gt;connected = TRUE;</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'>-gboolean</div><div class='del'>-camel_service_connect (CamelService *service, CamelException *ex)</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'>-	return CSERV_CLASS (service)-&gt;connect (service, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-service_disconnect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	service-&gt;connected = 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'>- * camel_service_disconnect:</div><div class='del'>- * @service: CamelService object</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Disconnect from the service.</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, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return CSERV_CLASS (service)-&gt;disconnect (service, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_connected (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return service-&gt;connected;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_is_connected:</div><div class='del'>- * @service: object to test</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the service is connected</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_service_is_connected (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return CSERV_CLASS (service)-&gt;is_connected (service);</div><div class='del'>-}</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, FALSE);</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'>-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'>- * This may be called on a service with or without an associated URL.</div><div class='del'>- * If there is no URL, the routine must return a generic answer. If</div><div class='del'>- * the service does have a URL, the routine SHOULD connect to the</div><div class='del'>- * server and query what authentication mechanisms it supports. If</div><div class='del'>- * it cannot do that for any reason, it should set @ex accordingly.</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 by calling camel_service_free_auth_types when</div><div class='del'>- * it is done.</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'>-	return CSERV_CLASS (service)-&gt;query_auth_types (service, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_auth_types (CamelService *service, GList *authtypes)</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_service_free_auth_types:</div><div class='del'>- * @service: the service</div><div class='del'>- * @authtypes: the list of authtypes</div><div class='del'>- *</div><div class='del'>- * This frees the data allocated by camel_service_query_auth_types().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_service_free_auth_types (CamelService *service, GList *authtypes)</div><div class='del'>-{</div><div class='del'>-	CSERV_CLASS (service)-&gt;free_auth_types (service, authtypes);</div><div class='del'>-}</div><div class='del'>-</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'>-	struct hostent *h;</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'>-	h = gethostbyname (hostname);</div><div class='del'>-	if (!h) {</div><div class='del'>-		extern int h_errno;</div><div class='del'>-</div><div class='del'>-		if (h_errno == HOST_NOT_FOUND || h_errno == NO_DATA) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-					      "No such host %s.", hostname);</div><div class='del'>-		} else {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      "Temporarily unable to look up "</div><div class='del'>-					      "hostname %s.", hostname);</div><div class='del'>-		}</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return h;</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 179447661b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-service.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-service.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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-#include &lt;netdb.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)     (GTK_CHECK_CAST((obj), CAMEL_SERVICE_TYPE, CamelService))</div><div class='del'>-#define CAMEL_SERVICE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass))</div><div class='del'>-#define CAMEL_IS_SERVICE(o)    (GTK_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelService {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	gboolean connected;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	int url_flags;</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'>-	gboolean  (*connect)           (CamelService *service, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-	gboolean  (*disconnect)        (CamelService *service, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-	gboolean  (*is_connected)      (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'>-	void      (*free_auth_types)   (CamelService *service,</div><div class='del'>-					GList *authtypes);</div><div class='del'>-</div><div class='del'>-} CamelServiceClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* flags for url_flags. (others can be added if needed) */</div><div class='del'>-#define CAMEL_SERVICE_URL_NEED_USER	(1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_SERVICE_URL_NEED_AUTH	(1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_SERVICE_URL_NEED_HOST	(1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_SERVICE_URL_NEED_PATH	(1 &lt;&lt; 6)</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, *description, *authproto;</div><div class='del'>-	gboolean need_password;</div><div class='del'>-} CamelServiceAuthType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelService *      camel_service_new                (GtkType type, </div><div class='del'>-						      CamelSession *session,</div><div class='del'>-						      CamelURL *url, </div><div class='del'>-						      CamelException *ex);</div><div class='del'>-</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'>-                                                      CamelException *ex);</div><div class='del'>-gboolean            camel_service_is_connected       (CamelService *service);</div><div class='del'>-</div><div class='del'>-char *              camel_service_get_url            (CamelService *service);</div><div class='del'>-CamelSession *      camel_service_get_session        (CamelService *service);</div><div class='del'>-</div><div class='del'>-GList *             camel_service_query_auth_types   (CamelService *service,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-void                camel_service_free_auth_types    (CamelService *service,</div><div class='del'>-						      GList *authtypes);</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'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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 3ee5766143..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-session.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-session.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,307 +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'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *  Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *  Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.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'>-</div><div class='del'>-static CamelObjectClass *parent_class;</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;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'>-}</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'>-</div><div class='del'>-	g_hash_table_destroy (prov-&gt;service_cache);</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 (GtkObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = (CamelSession *)o;</div><div class='del'>-</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'>-	GTK_OBJECT_CLASS (parent_class)-&gt;finalize (o);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_session_class_init (CamelServiceClass *camel_service_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *)camel_service_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_object_get_type ());</div><div class='del'>-	object_class-&gt;finalize = camel_session_finalise;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_session_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_session_type) {</div><div class='del'>-		GtkTypeInfo camel_session_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelSession",</div><div class='del'>-			sizeof (CamelSession),</div><div class='del'>-			sizeof (CamelSessionClass),</div><div class='del'>-			(GtkClassInitFunc) camel_session_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_session_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'>-		camel_session_type = gtk_type_unique (camel_object_get_type (),</div><div class='del'>-						      &amp;camel_session_info);</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'>-CamelSession *</div><div class='del'>-camel_session_new (CamelAuthCallback authenticator)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = gtk_type_new (CAMEL_SESSION_TYPE);</div><div class='del'>-</div><div class='del'>-	session-&gt;authenticator = authenticator;</div><div class='del'>-	return session;</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'>-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'>-	g_hash_table_insert (session-&gt;providers, provider-&gt;protocol, provider);</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'>-/**</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'>-	if (load) {</div><div class='del'>-		g_hash_table_foreach (session-&gt;modules, ensure_loaded, session);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = NULL;</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'>-static void</div><div class='del'>-service_cache_remove (CamelService *service, CamelSession *session)</div><div class='del'>-{</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 (service != NULL);</div><div class='del'>-	g_return_if_fail (service-&gt;url != NULL);</div><div class='del'>-	</div><div class='del'>-	provider = g_hash_table_lookup (session-&gt;providers, service-&gt;url-&gt;protocol);</div><div class='del'>-	g_hash_table_remove (provider-&gt;service_cache, service-&gt;url);</div><div class='del'>-}</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'>-	CamelURL *url;</div><div class='del'>-	const CamelProvider *provider;</div><div class='del'>-	CamelService *service;</div><div class='del'>-</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 = g_hash_table_lookup (session-&gt;providers, url-&gt;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, url-&gt;protocol);</div><div class='del'>-		if (path) {</div><div class='del'>-			camel_provider_load (session, path, ex);</div><div class='del'>-			if (camel_exception_get_id (ex) !=</div><div class='del'>-			    CAMEL_EXCEPTION_NONE) {</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'>-		provider = g_hash_table_lookup (session-&gt;providers, url-&gt;protocol);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!provider || !provider-&gt;object_types[type]) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      "No %s available for protocol `%s'",</div><div class='del'>-				      camel_provider_type_name[type],</div><div class='del'>-				      url-&gt;protocol);</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'>-	printf ("looking up service in cache: \"%s\"\n", camel_url_to_string (url, FALSE));</div><div class='del'>-	service = g_hash_table_lookup (provider-&gt;service_cache, url);</div><div class='del'>-	if (service != NULL) {</div><div class='del'>-		printf ("found!!\n");</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (service));</div><div class='del'>-		return service;</div><div class='del'>-	}</div><div class='del'>-	printf ("not found, creating service\n");</div><div class='del'>-</div><div class='del'>-	service = camel_service_new (provider-&gt;object_types[type], session, url, ex);</div><div class='del'>-	if (service) {</div><div class='del'>-		g_hash_table_insert (provider-&gt;service_cache, url, service);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (service), "destroy", service_cache_remove, session);</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'>-/**</div><div class='del'>- * camel_session_query_authenticator: query the session authenticator</div><div class='del'>- * @session: session object</div><div class='del'>- * @mode: %CAMEL_AUTHENTICATOR_ASK or %CAMEL_AUTHENTICATOR_TELL</div><div class='del'>- * @data: prompt to query user with, or data to cache</div><div class='del'>- * @secret: whether or not the data is secret (eg, a password)</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 discuss authentication</div><div class='del'>- * information with the application.</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'>- * If @mode is %CAMEL_AUTHENTICATOR_ASK, then @data is a question to</div><div class='del'>- * ask the user (if the application doesn't already have the answer</div><div class='del'>- * cached). If @secret is set, the user's input should not be echoed</div><div class='del'>- * back. The authenticator should set @ex to</div><div class='del'>- * %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'>- * If @mode is %CAMEL_AUTHENTICATOR_TELL, then @data is information</div><div class='del'>- * that the application should cache, or %NULL if it should stop</div><div class='del'>- * caching anything about that datum (eg, because the data is a</div><div class='del'>- * password that turned out to be incorrect).</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_query_authenticator (CamelSession *session,</div><div class='del'>-				   CamelAuthCallbackMode mode,</div><div class='del'>-				   char *prompt, gboolean secret,</div><div class='del'>-				   CamelService *service, char *item,</div><div class='del'>-				   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return session-&gt;authenticator (mode, prompt, secret,</div><div class='del'>-				       service, item, ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-session.h b/camel/camel-session.h<br/>deleted file mode 100644<br/>index 67dfe729fc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-session.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-session.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-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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-#define CAMEL_SESSION_TYPE     (camel_session_get_type ())</div><div class='del'>-#define CAMEL_SESSION(obj)     (GTK_CHECK_CAST((obj), CAMEL_SESSION_TYPE, CamelSession))</div><div class='del'>-#define CAMEL_SESSION_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass))</div><div class='del'>-#define CAMEL_IS_SESSION(o)    (GTK_CHECK_TYPE((o), CAMEL_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_AUTHENTICATOR_ASK, CAMEL_AUTHENTICATOR_TELL</div><div class='del'>-} CamelAuthCallbackMode;</div><div class='del'>-</div><div class='del'>-typedef char *(*CamelAuthCallback) (CamelAuthCallbackMode mode,</div><div class='del'>-				    char *data, gboolean secret,</div><div class='del'>-				    CamelService *service, char *item,</div><div class='del'>-				    CamelException *ex);</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'>-</div><div class='del'>-	CamelAuthCallback authenticator;</div><div class='del'>-</div><div class='del'>-	GHashTable *providers, *modules;</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'>-} CamelSessionClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_session_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelSession *  camel_session_new                     (CamelAuthCallback</div><div class='del'>-						       authenticator);</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'>-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'>-#define camel_session_get_store(session, url_string, ex) \</div><div class='del'>-	((CamelStore *) camel_session_get_service (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 (session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *          camel_session_query_authenticator (CamelSession *session,</div><div class='del'>-						   CamelAuthCallbackMode mode,</div><div class='del'>-						   char *prompt,</div><div class='del'>-						   gboolean secret,</div><div class='del'>-						   CamelService *service,</div><div class='del'>-						   char *item,</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_SESSION_H */</div><div class='head'>diff --git a/camel/camel-store.c b/camel/camel-store.c<br/>deleted file mode 100644<br/>index d729bf10e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-store.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'>-/* camel-store.c : Abstract class for an email store */</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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-exception.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 CamelStore */</div><div class='del'>-#define CS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(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'>-				gboolean create, 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'>-</div><div class='del'>-static char *get_folder_name (CamelStore *store, const char *folder_name,</div><div class='del'>-			      CamelException *ex);</div><div class='del'>-static char *get_root_folder_name (CamelStore *store, CamelException *ex);</div><div class='del'>-static char *get_default_folder_name (CamelStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolder *lookup_folder (CamelStore *store, const char *folder_name);</div><div class='del'>-static void cache_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			  CamelFolder *folder);</div><div class='del'>-static void uncache_folder (CamelStore *store, CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static void finalize (GtkObject *object);</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_store_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_service_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</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'>-	camel_store_class-&gt;get_folder_name = get_folder_name;</div><div class='del'>-	camel_store_class-&gt;get_root_folder_name = get_root_folder_name;</div><div class='del'>-	camel_store_class-&gt;get_default_folder_name = get_default_folder_name;</div><div class='del'>-	camel_store_class-&gt;lookup_folder = lookup_folder;</div><div class='del'>-	camel_store_class-&gt;cache_folder = cache_folder;</div><div class='del'>-	camel_store_class-&gt;uncache_folder = uncache_folder;</div><div class='del'>-</div><div class='del'>-	/* virtual method override */</div><div class='del'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_init (void *o, void *k)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = o;</div><div class='del'>-</div><div class='del'>-	store-&gt;folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_store_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_store_type) {</div><div class='del'>-		GtkTypeInfo camel_store_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelStore",</div><div class='del'>-			sizeof (CamelStore),</div><div class='del'>-			sizeof (CamelStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_store_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'>-		camel_store_type = gtk_type_unique (CAMEL_SERVICE_TYPE, &amp;camel_store_info);</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'>-</div><div class='del'>-static void</div><div class='del'>-finalize (GtkObject *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'>-			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'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-	    gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::get_folder not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (store)));</div><div class='del'>-	return NULL;</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'>-	g_warning ("CamelStore::delete_folder not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (store)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CamelStore::get_folder_name should:</div><div class='del'>- * a) make sure that the provided name is valid</div><div class='del'>- * b) return it in canonical form, in allocated memory.</div><div class='del'>- *</div><div class='del'>- * This is used to make sure that duplicate names for the same folder</div><div class='del'>- * don't result in duplicate cache entries.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-get_folder_name (CamelStore *store, const char *folder_name,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::get_folder_name not implemented for `%s'",</div><div class='del'>-		   gtk_type_name (GTK_OBJECT_TYPE (store)));</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_root_folder_name (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("/");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_default_folder_name (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return CS_CLASS (store)-&gt;get_root_folder_name (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-lookup_folder (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CamelFolder *folder = g_hash_table_lookup (store-&gt;folders, folder_name);</div><div class='del'>-		if (folder)</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(folder));</div><div class='del'>-		return folder;</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'>-cache_folder (CamelStore *store, const char *folder_name, CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	if (!store-&gt;folders)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup (store-&gt;folders, folder_name)) {</div><div class='del'>-		g_warning ("Caching folder %s that already exists.",</div><div class='del'>-			   folder_name);</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_insert (store-&gt;folders, g_strdup (folder_name), folder);</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (folder), "destroy",</div><div class='del'>-				   GTK_SIGNAL_FUNC (CS_CLASS (store)-&gt;uncache_folder),</div><div class='del'>-				   GTK_OBJECT (store));</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'>-uncache_folder (CamelStore *store, CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_foreach_remove (store-&gt;folders, folder_matches, folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder_internal (CamelStore *store, const char *folder_name,</div><div class='del'>-		     gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-</div><div class='del'>-	/* Try cache first. */</div><div class='del'>-	folder = CS_CLASS (store)-&gt;lookup_folder (store, folder_name);</div><div class='del'>-</div><div class='del'>-	if (!folder) {</div><div class='del'>-		folder = CS_CLASS (store)-&gt;get_folder (store, folder_name,</div><div class='del'>-						       create, ex);</div><div class='del'>-		if (!folder)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		CS_CLASS (store)-&gt;cache_folder (store, folder_name, folder);</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'>-</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'>- * @create: whether or not to create the folder if it doesn't already exist</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * </div><div class='del'>- * Returns the folder corresponding to the path @folder_name. If the</div><div class='del'>- * path begins with the separator character, it is relative to the</div><div class='del'>- * root folder. Otherwise, it is relative to the default folder. If</div><div class='del'>- * @create is %TRUE and the named folder does not already exist, it will</div><div class='del'>- * be created.</div><div class='del'>- *</div><div class='del'>- * Return value: the folder</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_store_get_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-</div><div class='del'>-	name = CS_CLASS (store)-&gt;get_folder_name (store, folder_name, ex);</div><div class='del'>-	if (name) {</div><div class='del'>-		folder = get_folder_internal (store, name, create, ex);</div><div class='del'>-		g_free (name);</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'>-/** </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,</div><div class='del'>-			   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	name = CS_CLASS (store)-&gt;get_folder_name (store, folder_name, ex);</div><div class='del'>-	if (name) {</div><div class='del'>-		CS_CLASS (store)-&gt;delete_folder (store, name, ex);</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'>-/**</div><div class='del'>- * camel_store_get_root_folder: return the top-level folder</div><div class='del'>- * </div><div class='del'>- * Returns the folder which is at the top of the folder hierarchy.</div><div class='del'>- * This folder may or may not be the same as the default folder.</div><div class='del'>- * </div><div class='del'>- * Return value: the top-level folder.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_store_get_root_folder (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-</div><div class='del'>-	name = CS_CLASS (store)-&gt;get_root_folder_name (store, ex);</div><div class='del'>-	if (name) {</div><div class='del'>-		folder = get_folder_internal (store, name, TRUE, ex);</div><div class='del'>-		g_free (name);</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'>- * camel_store_get_default_folder: return the store default folder</div><div class='del'>- *</div><div class='del'>- * The default folder is the folder which is presented to the user in</div><div class='del'>- * the default configuration. This defaults to the root folder if</div><div class='del'>- * the store doesn't override it.</div><div class='del'>- *</div><div class='del'>- * Return value: the default folder.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_store_get_default_folder (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-</div><div class='del'>-	name = CS_CLASS (store)-&gt;get_default_folder_name (store, ex);</div><div class='del'>-	if (name) {</div><div class='del'>-		folder = get_folder_internal (store, name, TRUE, ex);</div><div class='del'>-		g_free (name);</div><div class='del'>-	}</div><div class='del'>-	return folder;</div><div class='del'>-}</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 6d2d9e53e9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +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'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_TYPE     (camel_store_get_type ())</div><div class='del'>-#define CAMEL_STORE(obj)     (GTK_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))</div><div class='del'>-#define CAMEL_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))</div><div class='del'>-#define CAMEL_IS_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_STORE_TYPE))</div><div class='del'>-</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'>-</div><div class='del'>-	GHashTable *folders;</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'>-	CamelServiceClass parent_class;</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'>-						     gboolean create,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</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'>-</div><div class='del'>-	char *          (*get_folder_name)          (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	char *          (*get_root_folder_name)     (CamelStore *store,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	char *          (*get_default_folder_name)  (CamelStore *store,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</div><div class='del'>-        CamelFolder *   (*lookup_folder)            (CamelStore *store,</div><div class='del'>-						     const char *folder_name);</div><div class='del'>-	void            (*cache_folder)             (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelFolder *folder);</div><div class='del'>-        void            (*uncache_folder)           (CamelStore *store,</div><div class='del'>-						     CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-} CamelStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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'>-						 gboolean create,</div><div class='del'>-					         CamelException *ex);</div><div class='del'>-CamelFolder *    camel_store_get_root_folder    (CamelStore *store,</div><div class='del'>-					         CamelException *ex);</div><div class='del'>-CamelFolder *    camel_store_get_default_folder (CamelStore *store,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-</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'>-</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 633e42095b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-buffer.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-buffer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,481 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-stream-buffer.h"</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'>-static CamelStreamBufferClass *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 finalize (GtkObject *object);</div><div class='del'>-static void destroy (GtkObject *object);</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'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_stream_buffer_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-	gtk_object_class-&gt;destroy = destroy;</div><div class='del'>-</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'>-GtkType</div><div class='del'>-camel_stream_buffer_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_stream_buffer_type = 0;</div><div class='del'>-</div><div class='del'>-	gdk_threads_enter ();</div><div class='del'>-	if (!camel_stream_buffer_type)	{</div><div class='del'>-		GtkTypeInfo camel_stream_buffer_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelStreamBuffer",</div><div class='del'>-			sizeof (CamelStreamBuffer),</div><div class='del'>-			sizeof (CamelStreamBufferClass),</div><div class='del'>-			(GtkClassInitFunc) camel_stream_buffer_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_stream_buffer_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'>-		camel_stream_buffer_type = gtk_type_unique (camel_stream_get_type (), &amp;camel_stream_buffer_info);</div><div class='del'>-	}</div><div class='del'>-	gdk_threads_leave ();</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'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *stream_buffer = CAMEL_STREAM_BUFFER (object);</div><div class='del'>-</div><div class='del'>-	/* NOP to remove warnings */</div><div class='del'>-	stream_buffer-&gt;buf = stream_buffer-&gt;buf;</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'>-finalize (GtkObject *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'>-		gtk_object_unref(GTK_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'>-	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'>-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'>-		gtk_object_unref(GTK_OBJECT(sbf-&gt;stream));</div><div class='del'>-	sbf-&gt;stream = s;</div><div class='del'>-	gtk_object_ref(GTK_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 = gtk_type_new (camel_stream_buffer_get_type ());</div><div class='del'>-	CAMEL_STREAM_BUFFER_CLASS (GTK_OBJECT(sbf)-&gt;klass)-&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 = gtk_type_new (camel_stream_buffer_get_type ());</div><div class='del'>-	CAMEL_STREAM_BUFFER_CLASS (GTK_OBJECT(sbf)-&gt;klass)-&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'>-					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, n);</div><div class='del'>-					sbf-&gt;ptr += n;</div><div class='del'>-					bptr += n;</div><div class='del'>-					n -= bytes_read;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(bptr, sbf-&gt;ptr, bytes_left);</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'>-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'>-	const char *bptr = buffer;</div><div class='del'>-	ssize_t bytes_written = 1;</div><div class='del'>-        ssize_t bytes_left;</div><div class='del'>-	ssize_t total = n;</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'>-	while (n &amp;&amp; bytes_written &gt; 0) {</div><div class='del'>-		bytes_left = sbf-&gt;size - (sbf-&gt;ptr-sbf-&gt;buf);</div><div class='del'>-		if (bytes_left&lt;n) {</div><div class='del'>-			memcpy(sbf-&gt;ptr, bptr, bytes_left);</div><div class='del'>-			n -= bytes_left;</div><div class='del'>-			bptr += bytes_left;</div><div class='del'>-			bytes_written = camel_stream_write(sbf-&gt;stream, sbf-&gt;buf, sbf-&gt;size);</div><div class='del'>-			sbf-&gt;ptr = sbf-&gt;buf;</div><div class='del'>-			/* if we are writing a lot, write directly to the stream */</div><div class='del'>-			if (n &gt;= sbf-&gt;size/3) {</div><div class='del'>-				bytes_written = camel_stream_write(sbf-&gt;stream, bptr, n);</div><div class='del'>-				if (bytes_written &gt;0) {</div><div class='del'>-					bytes_written = n;</div><div class='del'>-					n -= bytes_written;</div><div class='del'>-					bptr += bytes_written;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				memcpy(sbf-&gt;ptr, bptr, 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'>-		} else {</div><div class='del'>-			memcpy(sbf-&gt;ptr, bptr, 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'>-	if (bytes_written == -1)</div><div class='del'>-		return -1;</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 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'>-			return -1;</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'>-	if (outptr &lt;= outend)</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[-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 367735e4e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-buffer.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-buffer.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-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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code Inc. (http://www.helixcode.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 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'>-</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;camel/camel-seekable-stream.h&gt;</div><div class='del'>-#include &lt;stdio.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)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBuffer))</div><div class='del'>-#define CAMEL_STREAM_BUFFER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass))</div><div class='del'>-#define CAMEL_IS_STREAM_BUFFER(o)    (GTK_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	CAMEL_STREAM_BUFFER_BUFFER = 0,</div><div class='del'>-	CAMEL_STREAM_BUFFER_NEWLINE,</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 Gtk function */</div><div class='del'>-GtkType 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 9051bdb64f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-filter.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,357 +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 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-stream-filter.h"</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'>-enum SIGNALS {</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'>-camel_stream_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'>-			"CamelStreamFilter",</div><div class='del'>-			sizeof (CamelStreamFilter),</div><div class='del'>-			sizeof (CamelStreamFilterClass),</div><div class='del'>-			(GtkClassInitFunc) camel_stream_filter_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_stream_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 (camel_stream_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'>-finalise(GtkObject *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'>-		gtk_object_unref((GtkObject *)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'>-	gtk_object_unref((GtkObject *)filter-&gt;source);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (camel_stream_filter_parent)-&gt;finalize (o);</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_class_init (CamelStreamFilterClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelStreamClass *camel_stream_class = (CamelStreamClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_stream_filter_parent = gtk_type_class (camel_stream_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalise;</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'>-	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'>-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'>-/**</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 ( gtk_type_new (camel_stream_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	new-&gt;source = stream;</div><div class='del'>-	gtk_object_ref ((GtkObject *)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'>-/**</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'>-	gtk_object_ref((GtkObject *)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'>-			gtk_object_unref((GtkObject *)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'>-			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'>-				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'>-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'>-</div><div class='del'>-	p-&gt;last_was_read = FALSE;</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, n, presize, &amp;buffer, &amp;n, &amp;presize);</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_write(filter-&gt;source, buffer, 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 len, presize;</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'>-	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'>-		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 0bc73732ec..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-filter.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-filter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 the GNU Library General Public License</div><div class='del'>- *  as published by the Free Software Foundation; either version 2 of</div><div class='del'>- *  the 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 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 program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</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'>-#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)         GTK_CHECK_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)</div><div class='del'>-#define CAMEL_STREAM_FILTER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)</div><div class='del'>-#define IS_CAMEL_STREAM_FILTER(obj)      GTK_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'>-guint			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'>-#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 b1a7dde41a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-fs.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-fs.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; 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-stream-fs.h"</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'>-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 (GTK_OBJECT(so)-&gt;klass)</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'>-static void finalize (GtkObject *object);</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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_stream_fs_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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'>-	gtk_object_class-&gt;finalize = finalize;</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'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_stream_fs_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_stream_fs_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_stream_fs_type) {</div><div class='del'>-		GtkTypeInfo camel_stream_fs_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelStreamFs",</div><div class='del'>-			sizeof (CamelStreamFs),</div><div class='del'>-			sizeof (CamelStreamFsClass),</div><div class='del'>-			(GtkClassInitFunc) camel_stream_fs_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_stream_fs_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'>-		camel_stream_fs_type = gtk_type_unique (camel_seekable_stream_get_type (), &amp;camel_stream_fs_info);</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'>-static void</div><div class='del'>-finalize (GtkObject *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'>-	GTK_OBJECT_CLASS (parent_class)-&gt;finalize (object);</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'>-	stream_fs = gtk_type_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'>-</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'>-	do {</div><div class='del'>-		nread = read (stream_fs-&gt;fd, buffer, n);</div><div class='del'>-	} while (nread == -1 &amp;&amp; errno == EINTR);</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 v, written = 0;</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'>-	do {</div><div class='del'>-		v = write (stream_fs-&gt;fd, buffer, n);</div><div class='del'>-		if (v &gt; 0)</div><div class='del'>-			written += v;</div><div class='del'>-	} while (v == -1 &amp;&amp; errno == EINTR);</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 (v == -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'>-	return close(((CamelStreamFs *)stream)-&gt;fd);</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'>-				stream-&gt;position = real;</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 08ae49bddf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-fs.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-fs.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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-#include &lt;camel/camel-seekable-stream.h&gt;</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'>-#define CAMEL_STREAM_FS_TYPE     (camel_stream_fs_get_type ())</div><div class='del'>-#define CAMEL_STREAM_FS(obj)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))</div><div class='del'>-#define CAMEL_STREAM_FS_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))</div><div class='del'>-#define CAMEL_IS_STREAM_FS(o)    (GTK_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 Gtk function */</div><div class='del'>-GtkType 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 722b49f3f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-mem.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-mem.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,256 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-stream-mem.h"</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'>-static CamelStreamClass *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 (GTK_OBJECT(so)-&gt;klass)</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 finalize (GtkObject *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'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_stream_mem_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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;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'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_mem_init (gpointer object, gpointer klass)</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'>-GtkType</div><div class='del'>-camel_stream_mem_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_stream_mem_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_stream_mem_type) {</div><div class='del'>-		GtkTypeInfo camel_stream_mem_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelStreamMem",</div><div class='del'>-			sizeof (CamelStreamMem),</div><div class='del'>-			sizeof (CamelStreamMemClass),</div><div class='del'>-			(GtkClassInitFunc) camel_stream_mem_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_stream_mem_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'>-		camel_stream_mem_type = gtk_type_unique (camel_seekable_stream_get_type (), &amp;camel_stream_mem_info);</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 = gtk_type_new (camel_stream_mem_get_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,</div><div class='del'>-				  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'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (GtkObject *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'>-	GTK_OBJECT_CLASS (parent_class)-&gt;finalize (object);</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 +</div><div class='del'>-			seekable-&gt;position, nread);</div><div class='del'>-		seekable-&gt;position += nread;</div><div class='del'>-	} else</div><div class='del'>-		nread = -1;</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'>-#warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object"</div><div class='del'>-	if (seekable-&gt;position == stream_mem-&gt;buffer-&gt;len) {</div><div class='del'>-		stream_mem-&gt;buffer =</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,</div><div class='del'>-				       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='del'>-</div><div class='del'>-</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 cf62f09547..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-mem.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream-mem.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;camel/camel-seekable-stream.h&gt;</div><div class='del'>-#include &lt;sys/types.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)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))</div><div class='del'>-#define CAMEL_STREAM_MEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))</div><div class='del'>-#define CAMEL_IS_STREAM_MEM(o)    (GTK_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 Gtk function */</div><div class='del'>-GtkType 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.c b/camel/camel-stream.c<br/>deleted file mode 100644<br/>index 244b6cf9d8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,294 +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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</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'>-</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 = gtk_type_class (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</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'>-GtkType</div><div class='del'>-camel_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_stream_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_stream_type)	{</div><div class='del'>-		GtkTypeInfo camel_stream_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelStream",</div><div class='del'>-			sizeof (CamelStream),</div><div class='del'>-			sizeof (CamelStreamClass),</div><div class='del'>-			(GtkClassInitFunc) camel_stream_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_stream_type = gtk_type_unique (camel_object_get_type (),</div><div class='del'>-						     &amp;camel_stream_info);</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'>-int</div><div class='del'>-camel_stream_read (CamelStream *stream, char *buffer, unsigned int 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'>-int</div><div class='del'>-camel_stream_write (CamelStream *stream, const char *buffer, unsigned int 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'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-	return 0;</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'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-	return 0;</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'>-static gboolean</div><div class='del'>-stream_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	return stream-&gt;eos;</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'>-/**</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'>-int</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'>-int</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'>-	int 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'>-int</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'>-	int total = 0;</div><div class='del'>-	int nb_read;</div><div class='del'>-	int 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'>-				int len = camel_stream_write (output_stream, tmp_buf + nb_written, 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 5660ca6e4c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-stream.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; 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;unistd.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)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))</div><div class='del'>-#define CAMEL_STREAM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass))</div><div class='del'>-#define CAMEL_IS_STREAM(o)    (GTK_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 Gtk function */</div><div class='del'>-GtkType 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-thread-proxy.c b/camel/camel-thread-proxy.c<br/>deleted file mode 100644<br/>index 9553499e8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-thread-proxy.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-thread-proxy.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,514 +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-pt-proxy.c : proxy folder using posix threads */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-marshal-utils.h"</div><div class='del'>-#include "camel-thread-proxy.h"</div><div class='del'>-#include &lt;pthread.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;errno.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* vocabulary: </div><div class='del'>- *  operation: commanded by the main thread, executed by the child thread</div><div class='del'>- *  callback: commanded by the child thread, generally when an operation is </div><div class='del'>- *    completed. Executed in the main thread, </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* needed for proper casts of async funcs when </div><div class='del'>- * calling pthreads_create</div><div class='del'>- */</div><div class='del'>-typedef void * (*thread_call_func) (void *);</div><div class='del'>-</div><div class='del'>-/* forward declarations */</div><div class='del'>-static gboolean  </div><div class='del'>-_thread_notification_catch (GIOChannel *source,</div><div class='del'>-			    GIOCondition condition,</div><div class='del'>-			    gpointer data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_notify_availability (CamelThreadProxy *proxy, gchar op_name);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-_init_notify_system (CamelThreadProxy *proxy);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_thread_proxy_new: create a new proxy object</div><div class='del'>- *  </div><div class='del'>- * Create a new proxy object. This proxy object can be used </div><div class='del'>- * to run async operations and this operations can trigger </div><div class='del'>- * callbacks. It can also be used to proxy signals.</div><div class='del'>- * </div><div class='del'>- * Return value: The newly created proxy object</div><div class='del'>- **/</div><div class='del'>-CamelThreadProxy *</div><div class='del'>-camel_thread_proxy_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelThreadProxy *proxy;</div><div class='del'>-	</div><div class='del'>-	proxy = g_new (CamelThreadProxy, 1);</div><div class='del'>-	if (!proxy)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	proxy-&gt;server_op_queue = camel_op_queue_new ();</div><div class='del'>-	proxy-&gt;client_op_queue = camel_op_queue_new ();</div><div class='del'>-	proxy-&gt;signal_data_cond = g_cond_new();</div><div class='del'>-	proxy-&gt;signal_data_mutex = g_mutex_new();</div><div class='del'>-	if (_init_notify_system (proxy) &lt; 0) {</div><div class='del'>-		g_free (proxy);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return proxy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_thread_proxy_free: free a proxy object</div><div class='del'>- * @proxy: proxy object to free</div><div class='del'>- * </div><div class='del'>- * free a proxy object</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_thread_proxy_free (CamelThreadProxy *proxy)</div><div class='del'>-{</div><div class='del'>-	g_cond_free (proxy-&gt;signal_data_cond);</div><div class='del'>-	g_mutex_free (proxy-&gt;signal_data_mutex);</div><div class='del'>-	camel_op_queue_free (proxy-&gt;server_op_queue);</div><div class='del'>-	camel_op_queue_free (proxy-&gt;client_op_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Operations handling */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * _op_run_free_notify:</div><div class='del'>- * @folder: folder to notify when the operation is completed. </div><div class='del'>- * @op: operation to run. </div><div class='del'>- * </div><div class='del'>- * run an operation, free the operation field</div><div class='del'>- * and then notify the main thread of the op</div><div class='del'>- * completion.</div><div class='del'>- * </div><div class='del'>- * this routine is intended to be called </div><div class='del'>- * in a new thread (in _run_next_op_in_thread)</div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-_op_run_free_and_notify (CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	CamelThreadProxy *th_proxy;</div><div class='del'>-	</div><div class='del'>-	camel_op_run (op);</div><div class='del'>-	camel_op_free (op);</div><div class='del'>-	th_proxy = camel_op_get_user_data (op);</div><div class='del'>-	_notify_availability (th_proxy, 'a');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * _run_next_op_in_thread:  </div><div class='del'>- * @proxy_object: </div><div class='del'>- * </div><div class='del'>- * run the next operation pending in the proxy </div><div class='del'>- * operation queue</div><div class='del'>- **/</div><div class='del'>-static void </div><div class='del'>-_run_next_op_in_thread (CamelThreadProxy *proxy)</div><div class='del'>-{</div><div class='del'>-	CamelOp *op;</div><div class='del'>-	CamelOpQueue *server_op_queue;</div><div class='del'>-	pthread_t thread;</div><div class='del'>-</div><div class='del'>-	server_op_queue = proxy-&gt;server_op_queue;</div><div class='del'>-	/* get the next pending operation */</div><div class='del'>-	op = camel_op_queue_pop_op (server_op_queue);</div><div class='del'>-	if (!op) {</div><div class='del'>-		camel_op_queue_set_service_availability (server_op_queue, TRUE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* run the operation in a child thread */</div><div class='del'>-	pthread_create (&amp;thread, NULL, (thread_call_func) _op_run_free_and_notify, op);</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_thread_proxy_push_op: push an operation in the proxy operation queue</div><div class='del'>- * @proxy: proxy object </div><div class='del'>- * @op: operation to push in the execution queue</div><div class='del'>- * </div><div class='del'>- * if no thread is currently running, executes the </div><div class='del'>- * operation directly, otherwise push the operation </div><div class='del'>- * in the proxy operation queue.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_thread_proxy_push_op (CamelThreadProxy *proxy, CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	CamelOpQueue *server_op_queue;</div><div class='del'>-	</div><div class='del'>-	g_assert (proxy);</div><div class='del'>-	server_op_queue = proxy-&gt;server_op_queue;</div><div class='del'>-	</div><div class='del'>-	/* put the proxy object in the user data</div><div class='del'>-	   so that it can be notified when the </div><div class='del'>-	   operation is completed */</div><div class='del'>-	camel_op_set_user_data (op, (gpointer)proxy);</div><div class='del'>-	</div><div class='del'>-	/* get next operation */</div><div class='del'>-	camel_op_queue_push_op (server_op_queue, op);</div><div class='del'>-	</div><div class='del'>-	if (camel_op_queue_get_service_availability (server_op_queue)) {</div><div class='del'>-		/* no thread is currently running, run </div><div class='del'>-		 * the next operation. */</div><div class='del'>-		camel_op_queue_set_service_availability (server_op_queue, FALSE);</div><div class='del'>-		/* when the operation is completed in the </div><div class='del'>-		   child thread the main thread gets </div><div class='del'>-		   notified and executes next operation </div><div class='del'>-		   (see _thread_notification_catch, case 'a')</div><div class='del'>-		   so there is no need to set the service</div><div class='del'>-		   availability to FALSE except here </div><div class='del'>-		*/</div><div class='del'>-		_run_next_op_in_thread (proxy);		</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-/**</div><div class='del'>- * _op_run_and_free: Run an operation and free it</div><div class='del'>- * @op: Operation object</div><div class='del'>- * </div><div class='del'>- * Run an operation object in the current thread </div><div class='del'>- * and free it.</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-_op_run_and_free (CamelOp *op)</div><div class='del'>-{</div><div class='del'>-	camel_op_run (op);</div><div class='del'>-	camel_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callbacks handling */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * _run_next_cb: Run next callback pending in a proxy object </div><div class='del'>- * @proxy: Proxy object </div><div class='del'>- * </div><div class='del'>- * Run next callback in the callback queue of a proxy object </div><div class='del'>- **/</div><div class='del'>-static void </div><div class='del'>-_run_next_cb (CamelThreadProxy *proxy)</div><div class='del'>-{</div><div class='del'>-	CamelOp *op;</div><div class='del'>-	CamelOpQueue *client_op_queue;</div><div class='del'>-</div><div class='del'>-	client_op_queue = proxy-&gt;client_op_queue;</div><div class='del'>-</div><div class='del'>-	/* get the next pending operation */</div><div class='del'>-	op = camel_op_queue_pop_op (client_op_queue);</div><div class='del'>-	if (!op) return;</div><div class='del'>-	</div><div class='del'>-	/* run the operation in the main thread */</div><div class='del'>-	_op_run_and_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_thread_proxy_push_cb: push a callback in the client queue</div><div class='del'>- * @proxy: proxy object concerned by the callback</div><div class='del'>- * @cb: callback to push</div><div class='del'>- * </div><div class='del'>- * Push an operation in the client queue, ie the queue </div><div class='del'>- * containing the operations (callbacks) intended to be</div><div class='del'>- * executed in the main thread.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_thread_proxy_push_cb (CamelThreadProxy *proxy, CamelOp *cb)</div><div class='del'>-{</div><div class='del'>-	CamelOpQueue *client_op_queue;</div><div class='del'>-	</div><div class='del'>-	client_op_queue = proxy-&gt;client_op_queue;</div><div class='del'>-</div><div class='del'>-	/* put the proxy object in the user data</div><div class='del'>-	   so that it can be notified when the </div><div class='del'>-	   operation is completed */</div><div class='del'>-	camel_op_set_user_data (cb, (gpointer)proxy);</div><div class='del'>-	</div><div class='del'>-	/* push the callback in the client queue */</div><div class='del'>-	camel_op_queue_push_op (client_op_queue, cb);</div><div class='del'>-	</div><div class='del'>-	/* tell the main thread a new callback is there */</div><div class='del'>-	_notify_availability (proxy, 'c');</div><div class='del'>-}  </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * _init_notify_system: set the notify channel up</div><div class='del'>- * @proxy: proxy object </div><div class='del'>- * </div><div class='del'>- * called once to set the notification channel up</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-_init_notify_system (CamelThreadProxy *proxy)</div><div class='del'>-{</div><div class='del'>-	int filedes[2];</div><div class='del'>-</div><div class='del'>-	/* set up the notification channel */</div><div class='del'>-	if (pipe (filedes) &lt; 0) {</div><div class='del'>-		g_warning ("could not create pipe in "</div><div class='del'>-			   "CamelThreadProxy::_init_notify_system\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	proxy-&gt;pipe_client_fd = filedes [0];</div><div class='del'>-	proxy-&gt;pipe_server_fd = filedes [1];</div><div class='del'>-	proxy-&gt;notify_source =  g_io_channel_unix_new (filedes [0]);</div><div class='del'>-	proxy-&gt;notify_channel =  g_io_channel_unix_new (filedes [1]);</div><div class='del'>-	</div><div class='del'>-	/* the _thread_notification_catch function </div><div class='del'>-	* will be called in the main thread when the </div><div class='del'>-	* child thread writes some data in the channel */ </div><div class='del'>-	g_io_add_watch (proxy-&gt;notify_source, G_IO_IN,</div><div class='del'>-			_thread_notification_catch, </div><div class='del'>-			proxy);</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'>- * _notify_availability: notify the main thread from an event</div><div class='del'>- * @proxy: proxy object</div><div class='del'>- * @op_name: operation name</div><div class='del'>- *</div><div class='del'>- * called by child thread  to notify the main </div><div class='del'>- * thread  something is available for him.</div><div class='del'>- * What this thing is depends on  @op_name:</div><div class='del'>- *</div><div class='del'>- * 'a' : thread available. That means the thread is ready </div><div class='del'>- *       to process an operation. </div><div class='del'>- * 's' : a signal is available. Used by the signal proxy.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-_notify_availability (CamelThreadProxy *proxy, gchar op_name)</div><div class='del'>-{</div><div class='del'>-	GIOChannel *notification_channel;</div><div class='del'>-	guint bytes_written;</div><div class='del'>-</div><div class='del'>-	notification_channel = proxy-&gt;notify_channel;	</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* the write operation will trigger the</div><div class='del'>-		 * watch on the main thread side */</div><div class='del'>-		g_io_channel_write  (notification_channel,</div><div class='del'>-				     &amp;op_name,</div><div class='del'>-				     1,</div><div class='del'>-				     &amp;bytes_written);	</div><div class='del'>-	} while (bytes_written &lt; 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* signal proxying */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * _signal_marshaller_server_side: called in the child thread to proxy a signal    </div><div class='del'>- * @object: </div><div class='del'>- * @data: </div><div class='del'>- * @n_args: </div><div class='del'>- * @args: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-_signal_marshaller_server_side (GtkObject *object,</div><div class='del'>-				gpointer data,</div><div class='del'>-				guint n_args,</div><div class='del'>-				GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	CamelThreadProxy *proxy;</div><div class='del'>-	guint signal_id;</div><div class='del'>-	</div><div class='del'>-	proxy = CAMEL_THREAD_PROXY (gtk_object_get_data (object, "__proxy__"));</div><div class='del'>-	signal_id = (guint)data;</div><div class='del'>-	g_assert (proxy);</div><div class='del'>-</div><div class='del'>-	g_mutex_lock (proxy-&gt;signal_data_mutex);</div><div class='del'>-	</div><div class='del'>-	/* we are going to wait for the main client thread </div><div class='del'>-	 * to have emitted the last signal we asked him</div><div class='del'>-	 * to proxy.</div><div class='del'>-	 */</div><div class='del'>-	while (proxy-&gt;signal_data.args)</div><div class='del'>-		g_cond_wait (proxy-&gt;signal_data_cond,</div><div class='del'>-			     proxy-&gt;signal_data_mutex);</div><div class='del'>-</div><div class='del'>-	proxy-&gt;signal_data.signal_id = signal_id;</div><div class='del'>-	proxy-&gt;signal_data.args = args;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	g_mutex_unlock (proxy-&gt;signal_data_mutex);</div><div class='del'>-</div><div class='del'>-	/* tell the main thread there is a signal pending */</div><div class='del'>-	_notify_availability (proxy, 's');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_signal_marshaller_client_side (CamelThreadProxy *proxy)</div><div class='del'>-{</div><div class='del'>-	g_mutex_lock (proxy-&gt;signal_data_mutex);</div><div class='del'>-	g_assert (proxy-&gt;signal_data.args);</div><div class='del'>-	</div><div class='del'>-	/* emit the pending signal */</div><div class='del'>-	gtk_signal_emitv (GTK_OBJECT (proxy), </div><div class='del'>-			  proxy-&gt;signal_data.signal_id,</div><div class='del'>-			  proxy-&gt;signal_data.args);</div><div class='del'>-</div><div class='del'>-	proxy-&gt;signal_data.args = NULL;</div><div class='del'>-</div><div class='del'>-	/* if waiting for the signal to be treated,</div><div class='del'>-	 * awake the client thread up </div><div class='del'>-	 */ </div><div class='del'>-	g_cond_signal (proxy-&gt;signal_data_cond);</div><div class='del'>-	g_mutex_unlock (proxy-&gt;signal_data_mutex);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_thread_proxy_add_signals: init the signal proxy</div><div class='del'>- * @proxy: proxy </div><div class='del'>- * @proxy_object: Proxy Gtk Object </div><div class='del'>- * @real_object: Real Gtk Object </div><div class='del'>- * @signal_to_proxy: NULL terminated array of signal name </div><div class='del'>- * </div><div class='del'>- * Add some signals to the list of signals to be </div><div class='del'>- * proxied by the proxy object.</div><div class='del'>- * The signals emitted by the real object in the child</div><div class='del'>- * thread are reemited by the proxy object in the </div><div class='del'>- * main thread.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_thread_proxy_add_signals (CamelThreadProxy *proxy, </div><div class='del'>-				GtkObject *proxy_object,</div><div class='del'>-				GtkObject *real_object,</div><div class='del'>-				char *signal_to_proxy[])</div><div class='del'>-{</div><div class='del'>-	guint i;</div><div class='del'>- </div><div class='del'>-	for (i=0; signal_to_proxy[i]; i++) {</div><div class='del'>-		/* connect the signal to the signal marshaller</div><div class='del'>-		 * user_data is the signal id */</div><div class='del'>-		gtk_signal_connect_full (GTK_OBJECT (real_object),</div><div class='del'>-					 signal_to_proxy[i],</div><div class='del'>-					 NULL,</div><div class='del'>-					 _signal_marshaller_server_side,</div><div class='del'>-					 (gpointer)gtk_signal_lookup (signal_to_proxy[i], </div><div class='del'>-								      GTK_OBJECT_CLASS (real_object)-&gt;type),</div><div class='del'>-					 NULL,</div><div class='del'>-					 TRUE,</div><div class='del'>-					 FALSE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/****   catch notification from child thread ****/</div><div class='del'>-/**</div><div class='del'>- * _thread_notification_catch: call by glib loop when data is available on the thread io channel</div><div class='del'>- * @source: </div><div class='del'>- * @condition: </div><div class='del'>- * @data: </div><div class='del'>- * </div><div class='del'>- * called by watch set on the IO channel</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE because we don't want the watch to be removed</div><div class='del'>- **/</div><div class='del'>-static gboolean  </div><div class='del'>-_thread_notification_catch (GIOChannel *source,</div><div class='del'>-			    GIOCondition condition,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelThreadProxy *proxy = CAMEL_THREAD_PROXY (data);	</div><div class='del'>-	gchar op_name;</div><div class='del'>-	guint bytes_read;</div><div class='del'>-	GIOError error;</div><div class='del'>-</div><div class='del'>-	error = g_io_channel_read (source,</div><div class='del'>-				   &amp;op_name,</div><div class='del'>-				   1,</div><div class='del'>-				   &amp;bytes_read);</div><div class='del'>-	</div><div class='del'>-	while ((!error) &amp;&amp; (bytes_read == 1)) {</div><div class='del'>-		</div><div class='del'>-		switch (op_name) { 		</div><div class='del'>-		case 'a': /* the thread is OK for a new operation */</div><div class='del'>-			_run_next_op_in_thread (proxy);		</div><div class='del'>-			break;</div><div class='del'>-		case 's': /* there is a pending signal to proxy */</div><div class='del'>-			_signal_marshaller_client_side (proxy);</div><div class='del'>-			break;</div><div class='del'>-		case 'c': /* there is a cb pending in the main thread */</div><div class='del'>-			_run_next_cb (proxy);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		error = g_io_channel_read (source,</div><div class='del'>-					   &amp;op_name,</div><div class='del'>-					   1,</div><div class='del'>-					   &amp;bytes_read);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* do not remove the io watch */</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'>-</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-thread-proxy.h b/camel/camel-thread-proxy.h<br/>deleted file mode 100644<br/>index 050d8ed598..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-thread-proxy.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-thread-proxy.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-folder-pt-proxy.h : proxy folder using posix threads */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_THREAD_PROXY_H</div><div class='del'>-#define CAMEL_THREAD_PROXY_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-op-queue.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_THREAD_PROXY(o)  (CamelThreadProxy *)(o)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	guint signal_id;</div><div class='del'>-	GtkArg *args;</div><div class='del'>-} CamelThreadProxySignalData;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-</div><div class='del'>-	GtkObject *real_object;</div><div class='del'>-	GtkObject *proxy_object;</div><div class='del'>-	</div><div class='del'>-	CamelOpQueue *server_op_queue;</div><div class='del'>-	CamelOpQueue *client_op_queue;</div><div class='del'>-</div><div class='del'>-  </div><div class='del'>-	gint pipe_client_fd;</div><div class='del'>-	gint pipe_server_fd;</div><div class='del'>-	GIOChannel *notify_source;</div><div class='del'>-	GIOChannel *notify_channel;</div><div class='del'>-</div><div class='del'>-	/* signal proxy */</div><div class='del'>-	GMutex *signal_data_mutex;</div><div class='del'>-	GCond *signal_data_cond;</div><div class='del'>-	CamelThreadProxySignalData signal_data;</div><div class='del'>-</div><div class='del'>-} CamelThreadProxy;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelThreadProxy *camel_thread_proxy_new (void);</div><div class='del'>-void camel_thread_proxy_free (CamelThreadProxy *proxy);</div><div class='del'>-</div><div class='del'>-void camel_thread_proxy_push_op (CamelThreadProxy *proxy, CamelOp *op);</div><div class='del'>-void camel_thread_proxy_push_cb (CamelThreadProxy *proxy, CamelOp *cb);</div><div class='del'>-</div><div class='del'>-void camel_thread_proxy_add_signals (CamelThreadProxy *proxy, </div><div class='del'>-				     GtkObject *proxy_object,</div><div class='del'>-				     GtkObject *real_object,</div><div class='del'>-				     char *signal_to_proxy[]);</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_THREAD_PROXY_H */</div><div class='del'>-</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 849248a6e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-transport.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-transport.c</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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-transport.h"</div><div class='del'>-#include "camel-exception.h"</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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_transport_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_transport_type)	{</div><div class='del'>-		GtkTypeInfo camel_transport_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelTransport",</div><div class='del'>-			sizeof (CamelTransport),</div><div class='del'>-			sizeof (CamelTransportClass),</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_transport_type = gtk_type_unique (CAMEL_SERVICE_TYPE, &amp;camel_transport_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_transport_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_transport_can_send: Determine if a message is send-able on a transport</div><div class='del'>- * @transport: the transport</div><div class='del'>- * @message: the message</div><div class='del'>- *</div><div class='del'>- * Determines if a CamelMedium is of an appropriate subclass to send</div><div class='del'>- * via the given @transport. (Mail transports are not able to send</div><div class='del'>- * netnews articles, and vice versa.)</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE or FALSE</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_transport_can_send (CamelTransport *transport, CamelMedium *message)</div><div class='del'>-{</div><div class='del'>-	return CT_CLASS (transport)-&gt;can_send (transport, message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_transport_send: Send a message via a transport</div><div class='del'>- * @transport: the transport</div><div class='del'>- * @message: the message</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Sends the message to the recipients indicated in the message.</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 (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return CT_CLASS (transport)-&gt;send (transport, message, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_transport_send_to: Send a message non-standard recipients</div><div class='del'>- * @transport: the transport</div><div class='del'>- * @message: the message</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, rather than to the</div><div class='del'>- * recipients indicated in the message.</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, CamelMedium *message,</div><div class='del'>-			 GList *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return CT_CLASS (transport)-&gt;send_to (transport, message,</div><div class='del'>-					      recipients, ex);</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 fc8f0e3076..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-transport.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-transport.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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;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)     (GTK_CHECK_CAST((obj), CAMEL_TRANSPORT_TYPE, CamelTransport))</div><div class='del'>-#define CAMEL_TRANSPORT_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_TRANSPORT_TYPE, CamelTransportClass))</div><div class='del'>-#define CAMEL_IS_TRANSPORT(o)    (GTK_CHECK_TYPE((o), CAMEL_TRANSPORT_TYPE))</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'>-};</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 (*can_send) (CamelTransport *transport, CamelMedium *message);</div><div class='del'>-	gboolean (*send) (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-			  CamelException *ex);</div><div class='del'>-	gboolean (*send_to) (CamelTransport *transport,</div><div class='del'>-			     CamelMedium *message, GList *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_can_send (CamelTransport *transport,</div><div class='del'>-				   CamelMedium *message);</div><div class='del'>-</div><div class='del'>-gboolean camel_transport_send (CamelTransport *transport,</div><div class='del'>-			       CamelMedium *message,</div><div class='del'>-			       CamelException *ex);</div><div class='del'>-</div><div class='del'>-gboolean camel_transport_send_to (CamelTransport *transport,</div><div class='del'>-				  CamelMedium *message,</div><div class='del'>-				  GList *recipients,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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 62567da1d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-types.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-types.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'>-/* </div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#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 _CamelDataWrapper CamelDataWrapper;</div><div class='del'>-typedef struct _CamelException CamelException;</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 _CamelMimeFilter CamelMimeFilter;</div><div class='del'>-typedef struct _CamelMimeFilterBasic CamelMimeFilterBasic;</div><div class='del'>-typedef struct _CamelMimeFilterCharset CamelMimeFilterCharset;</div><div class='del'>-typedef struct _CamelMimeFilterIndex CamelMimeFilterIndex;</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 _CamelObject CamelObject;</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 _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 _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='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-url.c b/camel/camel-url.c<br/>deleted file mode 100644<br/>index 75b7ac985e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-url.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,343 +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'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *  Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *  Tiago Antào &lt;tiagoantao@bigfoot.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#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 "camel-url.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_new: create a CamelURL object from a string</div><div class='del'>- * @url_string: The string containing the URL to scan</div><div class='del'>- * </div><div class='del'>- * This routine takes a string and parses it as a URL of the form:</div><div class='del'>- *</div><div class='del'>- *   protocol://user;AUTH=mech:password@host:port/path</div><div class='del'>- *</div><div class='del'>- * The protocol, followed by a ":" is required. If it is followed by * "//", there must be an "authority" containing at least a host,</div><div class='del'>- * which ends at the end of the string or at the next "/". If there</div><div class='del'>- * is an "@" in the authority, there must be a username before it,</div><div class='del'>- * and the host comes after it. The authmech, password, and port are</div><div class='del'>- * optional, and the punctuation that preceeds them is omitted if</div><div class='del'>- * they are. Everything after the authority (or everything after the</div><div class='del'>- * protocol if there was no authority) is the path. We consider the</div><div class='del'>- * "/" between the authority and the path to be part of the path,</div><div class='del'>- * although this is incorrect according to RFC 1738.</div><div class='del'>- *</div><div class='del'>- * The port, if present, must be numeric.</div><div class='del'>- * </div><div class='del'>- * If nothing but the protocol (and the ":") is present, the "empty"</div><div class='del'>- * flag will be set on the returned URL.</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelURL structure containing the URL items.</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;</div><div class='del'>-	char *semi, *colon, *at, *slash;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/* Find protocol: initial substring until ":" */</div><div class='del'>-	colon = strchr (url_string, ':');</div><div class='del'>-	if (!colon) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      "URL string `%s' contains no protocol",</div><div class='del'>-				      url_string);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	url = g_new0 (CamelURL, 1);</div><div class='del'>-	url-&gt;protocol = g_strndup (url_string, colon - url_string);</div><div class='del'>-	g_strdown (url-&gt;protocol);</div><div class='del'>-</div><div class='del'>-	/* Check protocol */</div><div class='del'>-	p = url-&gt;protocol;</div><div class='del'>-	while (*p) {</div><div class='del'>-		if (!((*p &gt;= 'a' &amp;&amp; *p &lt;= 'z') ||</div><div class='del'>-		      (*p == '-') || (*p == '+') || (*p == '.'))) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-					      "URL string `%s' contains an invalid protocol",</div><div class='del'>-					      url_string);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strncmp (colon, "://", 3) != 0) {</div><div class='del'>-		if (*(colon + 1)) {</div><div class='del'>-			url-&gt;path = g_strdup (colon + 1);</div><div class='del'>-			camel_url_decode (url-&gt;path);</div><div class='del'>-		} else</div><div class='del'>-			url-&gt;empty = TRUE;</div><div class='del'>-		return url;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	url_string = colon + 3;</div><div class='del'>-</div><div class='del'>-	/* If there is an @ sign in the authority, look for user,</div><div class='del'>-	 * authmech, and password before it.</div><div class='del'>-	 */</div><div class='del'>-	slash = strchr (url_string, '/');</div><div class='del'>-	at = strchr (url_string, '@');</div><div class='del'>-	if (at &amp;&amp; (!slash || 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, 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 || (!colon &amp;&amp; semi &lt; at)) &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'>-	slash = strchr (url_string, '/');</div><div class='del'>-	colon = strchr (url_string, ':');</div><div class='del'>-	if (slash &amp;&amp; colon &gt; slash)</div><div class='del'>-		colon = NULL;</div><div class='del'>-</div><div class='del'>-	if (colon) {</div><div class='del'>-		url-&gt;host = g_strndup (url_string, colon - url_string);</div><div class='del'>-		url-&gt;port = strtoul (colon + 1, &amp;colon, 10);</div><div class='del'>-		if (*colon &amp;&amp; colon != slash) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-					      "Port number in URL `%s' is non-"</div><div class='del'>-					      "numeric", url_string);</div><div class='del'>-			camel_url_free (url);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	} else if (slash) {</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'>-	} else {</div><div class='del'>-		url-&gt;host = g_strdup (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'>-	if (!slash)</div><div class='del'>-		slash = "/";</div><div class='del'>-	url-&gt;path = g_strdup (slash);</div><div class='del'>-	camel_url_decode (url-&gt;path);</div><div class='del'>-</div><div class='del'>-	return url;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_url_to_string (CamelURL *url, gboolean show_passwd)</div><div class='del'>-{</div><div class='del'>-	char *return_result;</div><div class='del'>-	char *user = NULL, *authmech = NULL, *passwd = NULL;</div><div class='del'>-	char *host = NULL, *path = NULL;</div><div class='del'>-	char port[20];</div><div class='del'>-</div><div class='del'>-	if (url-&gt;user)</div><div class='del'>-		user = camel_url_encode (url-&gt;user, TRUE, ":;@/");</div><div class='del'>-	if (url-&gt;authmech)</div><div class='del'>-		authmech = camel_url_encode (url-&gt;authmech, TRUE, ":@/");</div><div class='del'>-	if (show_passwd &amp;&amp; url-&gt;passwd)</div><div class='del'>-		passwd = camel_url_encode (url-&gt;passwd, TRUE, "@/");</div><div class='del'>-	if (url-&gt;host)</div><div class='del'>-		host = camel_url_encode (url-&gt;host, TRUE, ":/");</div><div class='del'>-	if (url-&gt;port)</div><div class='del'>-		g_snprintf (port, sizeof (port), "%d", url-&gt;port);</div><div class='del'>-	else</div><div class='del'>-		*port = '\0';</div><div class='del'>-	if (url-&gt;path)</div><div class='del'>-		path = camel_url_encode (url-&gt;path, FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	return_result = g_strdup_printf ("%s:%s%s%s%s%s%s%s%s%s%s%s",</div><div class='del'>-				url-&gt;protocol,</div><div class='del'>-				host ? "//" : "",</div><div class='del'>-				user ? user : "",</div><div class='del'>-				authmech ? ";auth=" : "",</div><div class='del'>-				authmech ? authmech : "",</div><div class='del'>-				passwd ? ":" : "",</div><div class='del'>-				passwd ? passwd : "",</div><div class='del'>-				user ? "@" : "",</div><div class='del'>-				host ? host : "",</div><div class='del'>-				*port ? ":" : "",</div><div class='del'>-				port,</div><div class='del'>-				path ? path : "");</div><div class='del'>-	g_free (user);</div><div class='del'>-	g_free (authmech);</div><div class='del'>-	g_free (passwd);</div><div class='del'>-	g_free (host);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	return return_result;</div><div class='del'>-}</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'>-	g_assert (url);</div><div class='del'>-</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'>-</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'>- * 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 (char *part, gboolean escape_unsafe, 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'>-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'>-guint 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'>-	add_hash (&amp;hash, u-&gt;protocol);</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'>-	add_hash (&amp;hash, u-&gt;path);</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 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; 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 bea1c439b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-url.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel-url.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-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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-</div><div class='del'>-	/* This is set if the URL contained only a protocol. */</div><div class='del'>-	gboolean empty;</div><div class='del'>-} CamelURL;</div><div class='del'>-</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, gboolean show_password);</div><div class='del'>-void camel_url_free (CamelURL *url);</div><div class='del'>-</div><div class='del'>-char *camel_url_encode (char *part, gboolean escape_unsafe,</div><div class='del'>-			char *escape_extra);</div><div class='del'>-void camel_url_decode (char *part);</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.c b/camel/camel.c<br/>deleted file mode 100644<br/>index 0121c1082f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel.c</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'>-/* </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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel.h"</div><div class='del'>-#include &lt;unicode.h&gt;</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-camel_init(void)</div><div class='del'>-{</div><div class='del'>-</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'>-	printf ("Threads are not supported by your version of glib\n");</div><div class='del'>-#endif /* G_THREADS_ENABLED */</div><div class='del'>-#endif /* ENABLE_THREADS */</div><div class='del'>-</div><div class='del'>-	unicode_init ();</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 e9300f83cb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/camel.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'>- *</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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-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-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.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-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-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-transport.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-#include &lt;camel/gmime-content-field.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/md5-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 (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_H */</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/devel-docs/camel_stream.dia</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/camel/gmime-content-field.c b/camel/gmime-content-field.c<br/>deleted file mode 100644<br/>index 4d38314873..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/gmime-content-field.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/gmime-content-field.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* mime-content_field.c : mime content type field utilities  */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "gmime-content-field.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_new: Creates a new GMimeContentField object</div><div class='del'>- * @type: mime type</div><div class='del'>- * @subtype: mime subtype </div><div class='del'>- * </div><div class='del'>- * Creates a GMimeContentField object and initialize it with</div><div class='del'>- * a mime type and a mime subtype. For example, </div><div class='del'>- * gmime_content_field_new ("application", "postcript");</div><div class='del'>- * will create a content field with complete mime type </div><div class='del'>- * "application/postscript"</div><div class='del'>- * </div><div class='del'>- * Return value: The newly created GMimeContentField object</div><div class='del'>- **/</div><div class='del'>-GMimeContentField *</div><div class='del'>-gmime_content_field_new (const gchar *type, const gchar *subtype)</div><div class='del'>-{</div><div class='del'>-	GMimeContentField *ctf;</div><div class='del'>-</div><div class='del'>-	ctf = g_new (GMimeContentField, 1);</div><div class='del'>-	ctf-&gt;content_type = header_content_type_new(type, subtype);</div><div class='del'>-	ctf-&gt;type = ctf-&gt;content_type-&gt;type;</div><div class='del'>-	ctf-&gt;subtype = ctf-&gt;content_type-&gt;subtype;</div><div class='del'>-	ctf-&gt;ref = 1;</div><div class='del'>-	return ctf;</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_ref: add a reference to a GMimeContentField object</div><div class='del'>- * @content_field: GMimeContentField object</div><div class='del'>- * </div><div class='del'>- * Tell a GMimeContentField object that something holds a reference</div><div class='del'>- * on him. This, coupled with the corresponding </div><div class='del'>- * gmime_content_field_unref() method allow several </div><div class='del'>- * objects to use the same GMimeContentField object.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-gmime_content_field_ref (GMimeContentField *content_field)</div><div class='del'>-{</div><div class='del'>-	content_field-&gt;ref += 1;</div><div class='del'>-	header_content_type_ref (content_field-&gt;content_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_unref: remove a reference to a GMimeContentField object</div><div class='del'>- * @content_field: GMimeContentField object</div><div class='del'>- * </div><div class='del'>- * Tell a GMimeContentField object that something which </div><div class='del'>- * was holding a reference to him does not need it anymore.</div><div class='del'>- * When no more reference exist, the GMimeContentField object</div><div class='del'>- * is freed using gmime_content_field_free().</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-gmime_content_field_unref (GMimeContentField *content_field)</div><div class='del'>-{</div><div class='del'>-	if (!content_field) return;</div><div class='del'>-	</div><div class='del'>-	content_field-&gt;ref -= 1;</div><div class='del'>-	header_content_type_unref (content_field-&gt;content_type);</div><div class='del'>-	if (content_field-&gt;ref &lt;= 0)</div><div class='del'>-		g_free (content_field);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_set_parameter: set a parameter for a GMimeContentField object</div><div class='del'>- * @content_field: content field</div><div class='del'>- * @attribute: parameter name </div><div class='del'>- * @value: paramteter value</div><div class='del'>- * </div><div class='del'>- * set a parameter (called attribute in RFC 2045) of a content field. Meaningfull</div><div class='del'>- * or valid parameters name depend on the content type object. For example, </div><div class='del'>- * gmime_content_field_set_parameter (cf, "charset", "us-ascii");</div><div class='del'>- * will make sense for a "text/plain" content field but not for a </div><div class='del'>- * "image/gif". This routine does not check parameter validity.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-gmime_content_field_set_parameter (GMimeContentField *content_field, const gchar *attribute, const gchar *value)</div><div class='del'>-{</div><div class='del'>-	header_content_type_set_param(content_field-&gt;content_type, attribute, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_write_to_stream: write a mime content type to a stream</div><div class='del'>- * @content_field: content type object</div><div class='del'>- * @stream: the stream</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	char *txt;</div><div class='del'>-</div><div class='del'>-	if (!content_field)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	txt = header_content_type_format(content_field-&gt;content_type);</div><div class='del'>-	if (txt) {</div><div class='del'>-		camel_stream_printf (stream, "Content-Type: %s\n", 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'>- * gmime_content_field_get_mime_type: return the mime type of the content field object</div><div class='del'>- * @content_field: content field object</div><div class='del'>- * </div><div class='del'>- * A RFC 2045 content type field contains the mime type in the</div><div class='del'>- * form "type/subtype" (example : "application/postscript") and some</div><div class='del'>- * parameters (attribute/value pairs). This routine returns the mime type </div><div class='del'>- * in a gchar object. THIS OBJECT MUST BE FREED BY THE CALLER.</div><div class='del'>- * </div><div class='del'>- * Return value: the mime type in the form "type/subtype" or NULL if not defined.</div><div class='del'>- **/</div><div class='del'>-gchar * </div><div class='del'>-gmime_content_field_get_mime_type (GMimeContentField *content_field)</div><div class='del'>-{</div><div class='del'>-	gchar *mime_type;</div><div class='del'>-</div><div class='del'>-	if (!content_field-&gt;content_type-&gt;type) return NULL;</div><div class='del'>-</div><div class='del'>-	if (content_field-&gt;content_type-&gt;subtype) </div><div class='del'>-		mime_type = g_strdup_printf ("%s/%s", content_field-&gt;content_type-&gt;type, content_field-&gt;content_type-&gt;subtype);</div><div class='del'>-	else </div><div class='del'>-		mime_type = g_strdup (content_field-&gt;content_type-&gt;type);</div><div class='del'>-	return mime_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_get_parameter: return the value of a mime type parameter</div><div class='del'>- * @content_field: content field object</div><div class='del'>- * @name: name of the parameter</div><div class='del'>- * </div><div class='del'>- * Returns the value of a parameter contained in the content field </div><div class='del'>- * object. The content type is formed of a mime type, a mime subtype,</div><div class='del'>- * and a parameter list. Each parameter is a name/value pair. This </div><div class='del'>- * routine returns the value assiciated to a given name. </div><div class='del'>- * When the parameter does not exist, NULL is returned. </div><div class='del'>- * </div><div class='del'>- * Return value: parameter value, or NULL if not found.</div><div class='del'>- **/</div><div class='del'>-const gchar *</div><div class='del'>-gmime_content_field_get_parameter (GMimeContentField *content_field, const gchar *name)</div><div class='del'>-{</div><div class='del'>-	g_assert (content_field);</div><div class='del'>-</div><div class='del'>-	g_assert (name);</div><div class='del'>-	return header_content_type_param(content_field-&gt;content_type, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_construct_from_string: construct a ContentType object by parsing a string.</div><div class='del'>- *</div><div class='del'>- * @content_field: content type object to construct </div><div class='del'>- * @string: string containing the content type field </div><div class='del'>- * </div><div class='del'>- * Parse a string containing a content type field as defined in</div><div class='del'>- * RFC 2045, and construct the corresponding ContentType object.</div><div class='del'>- * The string is not modified and not used in the ContentType </div><div class='del'>- * object. It can and must be freed by the calling part.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gmime_content_field_construct_from_string (GMimeContentField *content_field, const gchar *string)</div><div class='del'>-{</div><div class='del'>-	struct _header_content_type *new;</div><div class='del'>-</div><div class='del'>-	g_assert (string);</div><div class='del'>-	g_assert (content_field);</div><div class='del'>-</div><div class='del'>-	new = header_content_type_decode(string);</div><div class='del'>-	if (content_field-&gt;content_type)</div><div class='del'>-		header_content_type_unref(content_field-&gt;content_type);</div><div class='del'>-</div><div class='del'>-	if (new == NULL) {</div><div class='del'>-		new = header_content_type_new(NULL, NULL);</div><div class='del'>-		g_warning("Cannot parse content-type string: %s", string);</div><div class='del'>-	}</div><div class='del'>-	content_field-&gt;content_type = new;</div><div class='del'>-	content_field-&gt;type = new-&gt;type;</div><div class='del'>-	content_field-&gt;subtype = new-&gt;subtype;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gmime_content_field_is_type:</div><div class='del'>- * @content_field: An initialised GMimeContentField.</div><div class='del'>- * @type: MIME Major type name.</div><div class='del'>- * @subtype: MIME subtype.</div><div class='del'>- * </div><div class='del'>- * Returns true if the content_field is of the type @type and subtype @subtype.</div><div class='del'>- * If @subtype is the special wildcard "*", then it will match any type.</div><div class='del'>- *</div><div class='del'>- * If the @content_field is empty, then it will match "text/plain", or "text/ *".</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-gmime_content_field_is_type (GMimeContentField *content_field, const char *type, const char *subtype)</div><div class='del'>-{</div><div class='del'>-	return header_content_type_is(content_field-&gt;content_type, type, subtype);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/gmime-content-field.h b/camel/gmime-content-field.h<br/>deleted file mode 100644<br/>index 5a28d0fedb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/gmime-content-field.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/gmime-content-field.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'>-/* mime-content_field.h : mime content type field utilities  */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-#ifndef GMIME_CONTENT_FIELD_H</div><div class='del'>-#define GMIME_CONTENT_FIELD_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;stdio.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-utils.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	struct _header_content_type *content_type;</div><div class='del'>-</div><div class='del'>-	/* these should be deprecated (use the accessors) */</div><div class='del'>-	char *type;		/* these are only copies of the ones in content_type */</div><div class='del'>-	char *subtype;</div><div class='del'>-</div><div class='del'>-	gint ref;</div><div class='del'>-</div><div class='del'>-} GMimeContentField;</div><div class='del'>-</div><div class='del'>-GMimeContentField *gmime_content_field_new (const gchar *type, const gchar *subtype);</div><div class='del'>-void gmime_content_field_ref (GMimeContentField *content_field);</div><div class='del'>-void gmime_content_field_unref (GMimeContentField *content_field);</div><div class='del'>-</div><div class='del'>-void gmime_content_field_set_parameter (GMimeContentField *content_field, const gchar *attribute, const gchar *value);</div><div class='del'>-void gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStream *stream);</div><div class='del'>-void gmime_content_field_construct_from_string (GMimeContentField *content_field, const gchar *string);</div><div class='del'>-void gmime_content_field_free (GMimeContentField *content_field);</div><div class='del'>-gchar * gmime_content_field_get_mime_type (GMimeContentField *content_field);</div><div class='del'>-const gchar *gmime_content_field_get_parameter (GMimeContentField *content_field, const gchar *name);</div><div class='del'>-</div><div class='del'>-int gmime_content_field_is_type (GMimeContentField *content_field, const char *type, const char *subtype);</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 /* GMIME_CONTENT_FIELD_H */</div><div class='head'>diff --git a/camel/gstring-util.c b/camel/gstring-util.c<br/>deleted file mode 100644<br/>index a0c1345b71..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/gstring-util.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 Helix Code, Inc. (http://www.helixcode.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 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'>-</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "gstring-util.h"</div><div class='del'>-#include &lt;string.h&gt;</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 487bbc8a3b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/gstring-util.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/gstring-util.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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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 b04eaa3ce7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/hash-table-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/hash-table-utils.c</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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include "glib.h"</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 2904991848..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/hash-table-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/hash-table-utils.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'>-/* 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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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'>-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/md5-utils.c b/camel/md5-utils.c<br/>deleted file mode 100644<br/>index 7363eaec40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/md5-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/md5-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,391 +0,0 @@</div><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 "md5-utils.h"</div><div class='del'>-#include &lt;stdio.h&gt;</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_stream: get the md5 hash of a stream</div><div class='del'>- * @stream: stream</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 stream. 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_stream (CamelStream *stream, 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'>-</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	</div><div class='del'>-	nb_bytes_read = camel_stream_read (stream, tmp_buf, 1024);</div><div class='del'>-	while (nb_bytes_read) {</div><div class='del'>-		md5_update (&amp;ctx, tmp_buf, nb_bytes_read);</div><div class='del'>-		nb_bytes_read = camel_stream_read (stream, tmp_buf, 1024);</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'>-}</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/camel/md5-utils.h b/camel/md5-utils.h<br/>deleted file mode 100644<br/>index c911250d56..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/md5-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/md5-utils.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'>-/*</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'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</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'>-</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'>-void md5_get_digest_from_stream (CamelStream *stream, 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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/MH/.cvsignore b/camel/providers/MH/.cvsignore<br/>deleted file mode 100644<br/>index 2e7b174532..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/.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'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-.libs</div><div class='head'>diff --git a/camel/providers/MH/Makefile.am b/camel/providers/MH/Makefile.am<br/>deleted file mode 100644<br/>index 59662a07dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelmhincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcamelmh.la</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	$(GTK_INCLUDEDIR) -I$(top_srcdir)/camel	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-mh-provider\"	</div><div class='del'>-</div><div class='del'>-libcamelmh_la_SOURCES = 			\</div><div class='del'>-	camel-mh-folder.c			\</div><div class='del'>-	camel-mh-provider.c			\</div><div class='del'>-	camel-mh-store.c			\</div><div class='del'>-	mh-summary.c				\</div><div class='del'>-	mh-uid.c				\</div><div class='del'>-	mh-utils.c</div><div class='del'>-</div><div class='del'>-libcamelmhinclude_HEADERS =			\</div><div class='del'>-	camel-mh-folder.h			\</div><div class='del'>-	camel-mh-store.h			\</div><div class='del'>-	mh-summary.c				\</div><div class='del'>-	mh-uid.h				\</div><div class='del'>-	mh-utils.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-libcamelmh_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = </div><div class='head'>diff --git a/camel/providers/MH/camel-mh-folder.c b/camel/providers/MH/camel-mh-folder.c<br/>deleted file mode 100644<br/>index f4ff8f305a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/camel-mh-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/camel-mh-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1022 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-mh-folder.c : Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#include &lt;config.h&gt; </div><div class='del'>-#include &lt;sys/stat.h&gt; </div><div class='del'>-#include &lt;sys/param.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;fcntl.h&gt;</div><div class='del'>-#include &lt;dirent.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'>-#include "camel-mh-folder.h"</div><div class='del'>-#include "camel-mh-store.h"</div><div class='del'>-#include "gstring-util.h"</div><div class='del'>-#include "camel-log.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-buffered-fs.h"</div><div class='del'>-#include "camel-folder-summary.h"</div><div class='del'>-#include "gmime-utils.h"</div><div class='del'>-#include "mh-utils.h"</div><div class='del'>-#include "mh-uid.h"</div><div class='del'>-#include "mh-summary.h"</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'>-/* Returns the class for a CamelMhFolder */</div><div class='del'>-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMHS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void _set_name(CamelFolder *folder, const gchar *name, CamelException *ex);</div><div class='del'>-static void _init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex);</div><div class='del'>-static gboolean _exists (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean _create(CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);</div><div class='del'>-static gboolean _delete_messages (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GList *_list_subfolders (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *_get_message (CamelFolder *folder, gint number, CamelException *ex);</div><div class='del'>-static gint _get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gint _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-static void _expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex);</div><div class='del'>-static void _open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex);</div><div class='del'>-static void _close (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-static GList *_get_uid_list  (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* some utility functions */</div><div class='del'>-static int copy_reg (const char *src_path, const char *dst_path, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_folder_class_init (CamelMhFolderClass *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'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_folder_get_type ());</div><div class='del'>-		</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;init_with_store = _init_with_store;</div><div class='del'>-	camel_folder_class-&gt;set_name = _set_name;</div><div class='del'>-	camel_folder_class-&gt;exists = _exists;</div><div class='del'>-	camel_folder_class-&gt;delete = _delete;</div><div class='del'>-	camel_folder_class-&gt;delete_messages = _delete_messages;</div><div class='del'>-	camel_folder_class-&gt;list_subfolders = _list_subfolders;</div><div class='del'>-	camel_folder_class-&gt;get_message = _get_message;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = _get_message_count;</div><div class='del'>-	camel_folder_class-&gt;append_message = _append_message;</div><div class='del'>-	camel_folder_class-&gt;expunge = _expunge;</div><div class='del'>-	camel_folder_class-&gt;copy_message_to = _copy_message_to;</div><div class='del'>-	camel_folder_class-&gt;open = _open;</div><div class='del'>-	camel_folder_class-&gt;close = _close;</div><div class='del'>-	camel_folder_class-&gt;get_message_uid = _get_message_uid;</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = _get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;get_uid_list = _get_uid_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'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_mh_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_mh_folder_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_mh_folder_type)	{</div><div class='del'>-		GtkTypeInfo camel_mh_folder_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMhFolder",</div><div class='del'>-			sizeof (CamelMhFolder),</div><div class='del'>-			sizeof (CamelMhFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mh_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_mh_folder_type = gtk_type_unique (CAMEL_FOLDER_TYPE, &amp;camel_mh_folder_info);</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'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-_message_name_compare (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	gchar *m1 = (gchar *)a;</div><div class='del'>-	gchar *m2 = (gchar *)b;</div><div class='del'>-	gint len_diff;</div><div class='del'>-</div><div class='del'>-	return (atoi (m1) - atoi (m2));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-_init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* call parent method */</div><div class='del'>-	parent_class-&gt;init_with_store (folder, parent_store, ex);</div><div class='del'>-	</div><div class='del'>-	folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = TRUE;</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-	folder-&gt;has_uid_capability = TRUE;</div><div class='del'>- </div><div class='del'>-	folder-&gt;summary = 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'>-static void</div><div class='del'>-_open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	if (folder-&gt;open_state == FOLDER_OPEN) return;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	/* create message list */</div><div class='del'>-	/* read the whole folder and sort message names */</div><div class='del'>-	dir_handle = opendir (mh_folder-&gt;directory_path);</div><div class='del'>-	/* read first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while (dir_entry != NULL) {</div><div class='del'>-		/* tests if the entry correspond to a message file */</div><div class='del'>-		if (mh_is_a_message_file (dir_entry-&gt;d_name, mh_folder-&gt;directory_path))</div><div class='del'>-			/* add the file name to the list */</div><div class='del'>-			mh_folder-&gt;file_name_list = g_list_insert_sorted (mh_folder-&gt;file_name_list, </div><div class='del'>-									  g_strdup (dir_entry-&gt;d_name), </div><div class='del'>-									  _message_name_compare);</div><div class='del'>-	/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}		</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-	</div><div class='del'>-	/* get (or create) uid list */</div><div class='del'>-	if (!(mh_load_uid_list (mh_folder) &gt; 0))</div><div class='del'>-		mh_generate_uid_list (mh_folder);</div><div class='del'>-</div><div class='del'>-	/* get or create summary */</div><div class='del'>-	/* it is important that it comes after uid list reading/generation */</div><div class='del'>-	if (!(mh_load_summary (mh_folder) &gt; 0))</div><div class='del'>-		mh_generate_summary (folder);</div><div class='del'>-	printf ("**** summary = %p\n", folder-&gt;summary);</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'>-_close (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	/* save uid list, if any */</div><div class='del'>-	if (mh_folder-&gt;uid_array)</div><div class='del'>-		mh_save_uid_list (mh_folder);</div><div class='del'>-	</div><div class='del'>-	/* save summary, if any */</div><div class='del'>-	if (folder-&gt;summary)</div><div class='del'>-		mh_save_summary (mh_folder);</div><div class='del'>-	</div><div class='del'>-	/* call parent implementation */</div><div class='del'>-	parent_class-&gt;close (folder, expunge, ex);</div><div class='del'>-}</div><div class='del'>-</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_mh_folder_set_name: set the name of an MH folder</div><div class='del'>- * @folder: the folder to set the name</div><div class='del'>- * @name: a string representing the (short) 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'>-_set_name (CamelFolder *folder, const gchar *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-	const gchar *root_dir_path;</div><div class='del'>-	gchar *full_name;</div><div class='del'>-	const gchar *parent_full_name;</div><div class='del'>-	gchar separator;</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMhFolder::set_name\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	g_assert (name);</div><div class='del'>-	g_assert (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;set_name (folder, name, ex);</div><div class='del'>-	</div><div class='del'>-	if (mh_folder-&gt;directory_path) g_free (mh_folder-&gt;directory_path);</div><div class='del'>-	</div><div class='del'>-	separator = camel_store_get_separator (folder-&gt;parent_store);</div><div class='del'>-	root_dir_path = camel_mh_store_get_toplevel_dir (CAMEL_MH_STORE(folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::set_name full_name is %s\n", folder-&gt;full_name);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::set_name root_dir_path is %s\n", root_dir_path);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::separator is %c\n", separator);</div><div class='del'>-</div><div class='del'>-	mh_folder-&gt;directory_path = g_strdup_printf ("%s%c%s", root_dir_path, separator, folder-&gt;full_name);</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::set_name mh_folder-&gt;directory_path is %s\n", </div><div class='del'>-			      mh_folder-&gt;directory_path);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMhFolder::set_name\n");</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'>-_exists (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-	gint stat_error;</div><div class='del'>-	gboolean exists;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMhFolder::exists\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	</div><div class='del'>-	if (!mh_folder-&gt;directory_path)  return FALSE;</div><div class='del'>-	</div><div class='del'>-	stat_error = stat (mh_folder-&gt;directory_path, &amp;stat_buf);</div><div class='del'>-	if (stat_error == -1)  {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::exists when executing stat on %s, stat_error = %d\n", </div><div class='del'>-				      mh_folder-&gt;directory_path, stat_error);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is : %s\n", strerror(errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	exists = S_ISDIR (stat_buf.st_mode);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMhFolder::exists\n");</div><div class='del'>-	return exists;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_create (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	mode_t dir_mode = S_IRWXU;</div><div class='del'>-	gint mkdir_error;</div><div class='del'>-</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;create (folder, ex);</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (camel_folder_exists (folder, ex)) return TRUE;</div><div class='del'>-	</div><div class='del'>-	mkdir_error = mkdir (directory_path, dir_mode);</div><div class='del'>-	return (mkdir_error == -1);</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'>-_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	gint rmdir_error = 0;</div><div class='del'>-</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;delete (folder, recurse, ex);</div><div class='del'>-	/* the default implementation will care about deleting </div><div class='del'>-	   messages first and recursing the operation if </div><div class='del'>-	   necessary */</div><div class='del'>-	</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return TRUE;</div><div class='del'>-	</div><div class='del'>-	/* physically delete the directory */</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::delete removing directory %s\n", directory_path);</div><div class='del'>-	rmdir_error = rmdir (directory_path);</div><div class='del'>-	if (rmdir_error == -1) {</div><div class='del'>-		CAMEL_LOG_WARNING ("CamelMhFolder::delete Error when removing directory %s\n", directory_path);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ( "  Full error text is : %s\n", strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (rmdir_error != -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean </div><div class='del'>-_delete_messages (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-	gint stat_error = 0;</div><div class='del'>-	gchar *entry_name;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	gint unlink_error = 0;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;delete_messages (folder, ex);</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return TRUE;</div><div class='del'>-	</div><div class='del'>-	dir_handle = opendir (directory_path);</div><div class='del'>-	</div><div class='del'>-	/* read first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while ((stat_error != -1) &amp;&amp; (unlink_error != -1) &amp;&amp; (dir_entry != NULL)) {</div><div class='del'>-</div><div class='del'>-		/* get the name of the next entry in the dir */</div><div class='del'>-		entry_name = dir_entry-&gt;d_name;</div><div class='del'>-		stat_error = stat (mh_folder-&gt;directory_path, &amp;stat_buf);</div><div class='del'>-</div><div class='del'>-		/* is it a regular file ? */</div><div class='del'>-		if ((stat_error != -1) &amp;&amp; S_ISREG(stat_buf.st_mode)) {</div><div class='del'>-			/* yes, delete it */</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::delete_messages removing file %s\n", entry_name);</div><div class='del'>-			unlink_error = unlink(entry_name);</div><div class='del'>-</div><div class='del'>-			if (unlink_error == -1) {</div><div class='del'>-				CAMEL_LOG_WARNING ("CamelMhFolder::delete_messages Error when deleting file %s\n", </div><div class='del'>-						   entry_name);</div><div class='del'>-				CAMEL_LOG_FULL_DEBUG ( "  Full error text is : %s\n", strerror(errno));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-</div><div class='del'>-	return ((stat_error != -1) &amp;&amp; (unlink_error != -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 GList *</div><div class='del'>-_list_subfolders (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *subfolder_name_list = NULL;</div><div class='del'>-</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-	gint stat_error = 0;</div><div class='del'>-	GList *file_list;</div><div class='del'>-	gchar *entry_name;</div><div class='del'>-	gchar *full_entry_name;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;delete_messages (folder, ex);</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return NULL;</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return NULL;</div><div class='del'>-	</div><div class='del'>-	dir_handle = opendir (directory_path);</div><div class='del'>-	</div><div class='del'>-	/* read first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while ((stat_error != -1) &amp;&amp; (dir_entry != NULL)) {</div><div class='del'>-</div><div class='del'>-		/* get the name of the next entry in the dir */</div><div class='del'>-		entry_name = dir_entry-&gt;d_name;</div><div class='del'>-		full_entry_name = g_strdup_printf ("%s/%s", mh_folder-&gt;directory_path, entry_name);</div><div class='del'>-		stat_error = stat (full_entry_name, &amp;stat_buf);</div><div class='del'>-		g_free (full_entry_name);</div><div class='del'>-</div><div class='del'>-		/* is it a directory ? */</div><div class='del'>-		if ((stat_error != -1) &amp;&amp; S_ISDIR (stat_buf.st_mode)) {</div><div class='del'>-			/* yes, add it to the list */</div><div class='del'>-			if (entry_name[0] != '.') {</div><div class='del'>-				CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::list_subfolders adding  %s\n", entry_name);</div><div class='del'>-				subfolder_name_list = g_list_append (subfolder_name_list, g_strdup (entry_name));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-</div><div class='del'>-	return subfolder_name_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'>-static void</div><div class='del'>-_filename_free (gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free ((gchar *)data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* slow routine, may be optimixed, or we should use</div><div class='del'>-   caches if users complain */</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-_get_message (CamelFolder *folder, gint number, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	gchar *message_name;</div><div class='del'>-	gchar *message_file_name;</div><div class='del'>-	CamelStream *input_stream = NULL;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	GList *message_list = NULL;</div><div class='del'>-	</div><div class='del'>-	g_assert(folder);</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return NULL;	</div><div class='del'>-</div><div class='del'>-		</div><div class='del'>-	</div><div class='del'>-	message_name = g_list_nth_data (mh_folder-&gt;file_name_list, number);</div><div class='del'>-	</div><div class='del'>-	if (message_name != NULL) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG  ("CanelMhFolder::get_message message number = %d, name = %s\n", </div><div class='del'>-				       number, message_name);</div><div class='del'>-		message_file_name = g_strdup_printf ("%s/%s", directory_path, message_name);</div><div class='del'>-		input_stream = camel_stream_buffered_fs_new_with_name (message_file_name, CAMEL_STREAM_BUFFERED_FS_READ);</div><div class='del'>-		</div><div class='del'>-		if (input_stream != NULL) {</div><div class='del'>-#warning use session field here</div><div class='del'>-			message = camel_mime_message_new ();</div><div class='del'>-			camel_data_wrapper_construct_from_stream ( CAMEL_DATA_WRAPPER (message), input_stream);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (input_stream));</div><div class='del'>-			message-&gt;message_number = number;</div><div class='del'>-			gtk_object_set_data_full (GTK_OBJECT (message), "filename", </div><div class='del'>-						  g_strdup (message_name), _filename_free);</div><div class='del'>-			</div><div class='del'>-#warning Set flags and all this stuff here</div><div class='del'>-		}</div><div class='del'>-		g_free (message_file_name);</div><div class='del'>-	} else </div><div class='del'>-		CAMEL_LOG_FULL_DEBUG  ("CanelMhFolder::get_message message number = %d, not found\n", number);</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'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	guint message_count = 0;</div><div class='del'>-</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return -1;</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return 0;</div><div class='del'>-	</div><div class='del'>-	dir_handle = opendir (directory_path);</div><div class='del'>-	</div><div class='del'>-	/* read first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while (dir_entry != NULL) {</div><div class='del'>-		/* tests if the entry correspond to a message file */</div><div class='del'>-		if (mh_is_a_message_file (dir_entry-&gt;d_name, directory_path)) </div><div class='del'>-			message_count++;	</div><div class='del'>-		/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::get_message_count found %d messages\n", message_count);</div><div class='del'>-	return message_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'>-_find_next_free_message_file (CamelFolder *folder, gint *new_msg_number, gchar **new_msg_filename, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	gint last_max_message_number = 0;</div><div class='del'>-	gint current_message_number;</div><div class='del'>-</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return FALSE;</div><div class='del'>-	</div><div class='del'>-	dir_handle = opendir (directory_path);</div><div class='del'>-	</div><div class='del'>-	/* read first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while (dir_entry != NULL) {</div><div class='del'>-		/* tests if the entry correspond to a message file */</div><div class='del'>-		if (mh_is_a_message_file (dir_entry-&gt;d_name, directory_path)) {</div><div class='del'>-			/* see if the message number is the biggest found */</div><div class='del'>-			current_message_number = atoi (dir_entry-&gt;d_name);</div><div class='del'>-			if (current_message_number &gt; last_max_message_number)</div><div class='del'>-				last_max_message_number = current_message_number;</div><div class='del'>-		}</div><div class='del'>-		/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-	</div><div class='del'>-	*new_msg_number = last_max_message_number + 1;</div><div class='del'>-	*new_msg_filename = g_strdup_printf ("%s/%d", directory_path, *new_msg_number);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::find_next_free_message_file new message path is %s\n", </div><div class='del'>-			      *new_msg_filename);</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-static gint</div><div class='del'>-_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	guint new_msg_number;</div><div class='del'>-	gchar *new_msg_filename;</div><div class='del'>-	CamelStream *output_stream;</div><div class='del'>-	gboolean error;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMhFolder::append_message\n");</div><div class='del'>-	if (!_find_next_free_message_file (folder, &amp;new_msg_number, &amp;new_msg_filename, ex))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	output_stream = camel_stream_fs_new_with_name (new_msg_filename, CAMEL_STREAM_FS_WRITE);</div><div class='del'>-	if (output_stream != NULL) {</div><div class='del'>-		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream);</div><div class='del'>-		camel_stream_close (output_stream);</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_LOG_WARNING ("CamelMhFolder::append_message could not open %s for writing\n", </div><div class='del'>-				   new_msg_filename);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is : %s\n", strerror(errno));</div><div class='del'>-		error = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (new_msg_filename);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMhFolder::append_message\n");</div><div class='del'>-	if (error) return -1;</div><div class='del'>-	else return new_msg_number;</div><div class='del'>-}</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'>-_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* For the moment, we look in the folder active message</div><div class='del'>-	 * list. I did not make my mind for the moment, should </div><div class='del'>-	 * the gtk_object-&gt;destroy signal be used to expunge</div><div class='del'>-	 * freed messages objects marked DELETED ? </div><div class='del'>-	 */</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	GList *message_node;</div><div class='del'>-	gchar *fullpath;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	gint unlink_error;</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelFolder::expunge\n");</div><div class='del'>-	</div><div class='del'>-	message_node = folder-&gt;message_list;</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) return;</div><div class='del'>-</div><div class='del'>-	/* look in folder message list which messages</div><div class='del'>-	 * need to be expunged  */</div><div class='del'>-	while ( message_node) {</div><div class='del'>-		message = CAMEL_MIME_MESSAGE (message_node-&gt;data);</div><div class='del'>-		</div><div class='del'>-		if (message &amp;&amp; camel_mime_message_get_flag (message, "DELETED")) {</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::expunge, expunging  message %d\n", message-&gt;message_number);</div><div class='del'>-			/* expunge the message */</div><div class='del'>-			filename = gtk_object_get_data (GTK_OBJECT (message), "filename");</div><div class='del'>-			fullpath = g_strdup_printf ("%s/%s", directory_path, filename);</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::expunge, message fullpath is %s\n", </div><div class='del'>-					      fullpath);</div><div class='del'>-			unlink_error = unlink(fullpath);</div><div class='del'>-			if (unlink_error != -1) {</div><div class='del'>-				message-&gt;expunged = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				CAMEL_LOG_WARNING ("CamelMhFolder:: could not unlink %s (message %d)\n", </div><div class='del'>-						   fullpath, message-&gt;message_number);</div><div class='del'>-				CAMEL_LOG_FULL_DEBUG ("  Full error text is : %s\n", strerror(errno));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		message_node = message_node-&gt;next;</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("CamelFolder::expunge, examined message node %p\n", message_node);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelFolder::expunge\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gchar *src_msg_filename;</div><div class='del'>-	guint dest_msg_number;</div><div class='del'>-	gchar *dest_msg_filename;</div><div class='del'>-</div><div class='del'>-	if (IS_CAMEL_MH_FOLDER (dest_folder)) {</div><div class='del'>-		/*g_return_if_fail (message-&gt;parent_folder == folder);*/</div><div class='del'>-		</div><div class='del'>-		if (!_find_next_free_message_file (dest_folder, &amp;dest_msg_number, &amp;dest_msg_filename, ex))</div><div class='del'>-			return;</div><div class='del'>-		src_msg_filename = gtk_object_get_data (GTK_OBJECT (message), "fullpath");</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::copy_to copy file %s to %s\n", src_msg_filename, dest_msg_filename);</div><div class='del'>-		copy_reg (src_msg_filename, dest_msg_filename, ex);</div><div class='del'>-		</div><div class='del'>-	} else </div><div class='del'>-		parent_class-&gt;copy_message_to (folder, message, dest_folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/** UID **/</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-	gboolean found = FALSE;</div><div class='del'>-	MhUidCouple *uid_couple;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	guint file_number;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	/* if the message already has its uid stored, </div><div class='del'>-	   return it */</div><div class='del'>-	if (message-&gt;message_uid)</div><div class='del'>-		return (message-&gt;message_uid);</div><div class='del'>-</div><div class='del'>-	/* else, it has a filename associated to it */</div><div class='del'>-	filename = gtk_object_get_data (GTK_OBJECT (message), "filename");</div><div class='del'>-	file_number = atoi (file_number);</div><div class='del'>-	</div><div class='del'>-	uid_array = mh_folder-&gt;uid_array;</div><div class='del'>-	uid_couple = (MhUidCouple *)uid_array-&gt;data;</div><div class='del'>-	</div><div class='del'>-	/* look in the uid array for the file number */</div><div class='del'>-	found = (uid_couple-&gt;file_number == file_number);</div><div class='del'>-	for (i=0; (i&lt;uid_array-&gt;len) &amp;&amp; (!found); i++) {		</div><div class='del'>-		uid_couple++;</div><div class='del'>-		found = (uid_couple-&gt;file_number == file_number);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (found) return uid_couple-&gt;uid;</div><div class='del'>-	else return NULL;</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'>-_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-	gboolean found = FALSE;</div><div class='del'>-	MhUidCouple *uid_couple;</div><div class='del'>-	gint file_number;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelStream *input_stream;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* </div><div class='del'>-	 * because they are constructed with md5</div><div class='del'>-	 * signatures, all MH uids are 16 bytes long</div><div class='del'>-	 */</div><div class='del'>-	if (strlen (uid) != 16) return NULL;</div><div class='del'>-</div><div class='del'>-	uid_array = mh_folder-&gt;uid_array;</div><div class='del'>-	uid_couple = (MhUidCouple *)uid_array-&gt;data;</div><div class='del'>-	</div><div class='del'>-	found = !strncmp (uid, uid_couple-&gt;uid, 16 * sizeof (guchar));</div><div class='del'>-	for (i=0; (i&lt;uid_array-&gt;len) &amp;&amp; (!found); i++) {		</div><div class='del'>-		uid_couple++;</div><div class='del'>-		found = !strncmp (uid, uid_couple-&gt;uid, 16 * sizeof (guchar));</div><div class='del'>-	}</div><div class='del'>-	if (found) {</div><div class='del'>-		/* physically retrieve the message */</div><div class='del'>-		file_number = uid_couple-&gt;file_number;</div><div class='del'>-		filename = g_strdup_printf ("%d", file_number);</div><div class='del'>-		input_stream = camel_stream_buffered_fs_new_with_name (filename, CAMEL_STREAM_BUFFERED_FS_READ);</div><div class='del'>-		</div><div class='del'>-		if (input_stream != NULL) {</div><div class='del'>-#warning use session field here</div><div class='del'>-			message = camel_mime_message_new ();</div><div class='del'>-			camel_data_wrapper_construct_from_stream ( CAMEL_DATA_WRAPPER (message), input_stream);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (input_stream));</div><div class='del'>-</div><div class='del'>-			/* set message UID in CamelMimeMessage */			 </div><div class='del'>-			message-&gt;message_uid = g_strdup (uid);</div><div class='del'>-			</div><div class='del'>-		}</div><div class='del'>-		g_free (filename);</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'>-</div><div class='del'>-static GList *</div><div class='del'>-_get_uid_list  (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-	GList *uid_list;</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-	MhUidCouple *uid_couple;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	uid_array = mh_folder-&gt;uid_array;</div><div class='del'>-	uid_couple = (MhUidCouple *)uid_array-&gt;data;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;uid_array-&gt;len; i++) {</div><div class='del'>-		uid_list = g_list_prepend (uid_list, uid_couple-&gt;uid);</div><div class='del'>-		uid_couple++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return uid_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'>-</div><div class='del'>-</div><div class='del'>-/************************************************************************/</div><div class='del'>-</div><div class='del'>-/*** Took directly from GNU fileutils-4.0                             ***/</div><div class='del'>-/* Copyright (C) 89, 90, 91, 95, 96, 97, 1998 Free Software Foundation. */</div><div class='del'>-/* This may be rwritten soon. -Bertrand                                 */               </div><div class='del'>-</div><div class='del'>-    </div><div class='del'>-/* Write LEN bytes at PTR to descriptor DESC, retrying if interrupted.</div><div class='del'>-   Return LEN upon success, write's (negative) error code otherwise.  */</div><div class='del'>-int</div><div class='del'>-full_write (int desc, const char *ptr, size_t len)</div><div class='del'>-{</div><div class='del'>-  int total_written;</div><div class='del'>-</div><div class='del'>-  total_written = 0;</div><div class='del'>-  while (len &gt; 0)</div><div class='del'>-    {</div><div class='del'>-      int written = write (desc, ptr, len);</div><div class='del'>-      if (written &lt; 0)</div><div class='del'>-	{</div><div class='del'>-	  if (errno == EINTR)</div><div class='del'>-	    continue;</div><div class='del'>-	  return written;</div><div class='del'>-	}</div><div class='del'>-      total_written += written;</div><div class='del'>-      ptr += written;</div><div class='del'>-      len -= written;</div><div class='del'>-    }</div><div class='del'>-  return total_written;</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'>-copy_reg (const char *src_path, const char *dst_path, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-  char *buf;</div><div class='del'>-  int buf_size;</div><div class='del'>-  int dest_desc;</div><div class='del'>-  int source_desc;</div><div class='del'>-  int n_read;</div><div class='del'>-  struct stat sb;</div><div class='del'>-  char *cp;</div><div class='del'>-  int *ip;</div><div class='del'>-  int return_val = 0;</div><div class='del'>-  off_t n_read_total = 0;</div><div class='del'>-  int last_write_made_hole = 0;</div><div class='del'>-  int make_holes = TRUE;</div><div class='del'>-</div><div class='del'>-  source_desc = open (src_path, O_RDONLY);</div><div class='del'>-  if (source_desc &lt; 0)</div><div class='del'>-    {</div><div class='del'>-      /* If SRC_PATH doesn't exist, then chances are good that the</div><div class='del'>-	 user did something like this `cp --backup foo foo': and foo</div><div class='del'>-	 existed to start with, but copy_internal renamed DST_PATH</div><div class='del'>-	 with the backup suffix, thus also renaming SRC_PATH.  */</div><div class='del'>-      if (errno == ENOENT)</div><div class='del'>-	error (0, 0, "`%s' and `%s' are the same file",</div><div class='del'>-	       src_path, dst_path);</div><div class='del'>-      else</div><div class='del'>-	error (0, errno, "%s", src_path);</div><div class='del'>-</div><div class='del'>-      return -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  /* Create the new regular file with small permissions initially,</div><div class='del'>-     to not create a security hole.  */</div><div class='del'>-</div><div class='del'>-  dest_desc = open (dst_path, O_WRONLY | O_CREAT | O_TRUNC, 0600);</div><div class='del'>-  if (dest_desc &lt; 0)</div><div class='del'>-    {</div><div class='del'>-      error (0, errno, "cannot create regular file `%s'", dst_path);</div><div class='del'>-      return_val = -1;</div><div class='del'>-      goto ret2;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  /* Find out the optimal buffer size.  */</div><div class='del'>-</div><div class='del'>-  if (fstat (dest_desc, &amp;sb))</div><div class='del'>-    {</div><div class='del'>-      error (0, errno, "%s", dst_path);</div><div class='del'>-      return_val = -1;</div><div class='del'>-      goto ret;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  buf_size = 8192;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  /* Make a buffer with space for a sentinel at the end.  */</div><div class='del'>-</div><div class='del'>-  buf = (char *) alloca (buf_size + sizeof (int));</div><div class='del'>-</div><div class='del'>-  for (;;)</div><div class='del'>-    {</div><div class='del'>-      n_read = read (source_desc, buf, buf_size);</div><div class='del'>-      if (n_read &lt; 0)</div><div class='del'>-	{</div><div class='del'>-	  if (errno == EINTR)</div><div class='del'>-	    continue;</div><div class='del'>-	  error (0, errno, "%s", src_path);</div><div class='del'>-	  return_val = -1;</div><div class='del'>-	  goto ret;</div><div class='del'>-	}</div><div class='del'>-      if (n_read == 0)</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      n_read_total += n_read;</div><div class='del'>-</div><div class='del'>-      ip = 0;</div><div class='del'>-      if (make_holes)</div><div class='del'>-	{</div><div class='del'>-	  buf[n_read] = 1;	/* Sentinel to stop loop.  */</div><div class='del'>-</div><div class='del'>-	  /* Find first nonzero *word*, or the word with the sentinel.  */</div><div class='del'>-</div><div class='del'>-	  ip = (int *) buf;</div><div class='del'>-	  while (*ip++ == 0)</div><div class='del'>-	    ;</div><div class='del'>-</div><div class='del'>-	  /* Find the first nonzero *byte*, or the sentinel.  */</div><div class='del'>-</div><div class='del'>-	  cp = (char *) (ip - 1);</div><div class='del'>-	  while (*cp++ == 0)</div><div class='del'>-	    ;</div><div class='del'>-</div><div class='del'>-	  /* If we found the sentinel, the whole input block was zero,</div><div class='del'>-	     and we can make a hole.  */</div><div class='del'>-</div><div class='del'>-	  if (cp &gt; buf + n_read)</div><div class='del'>-	    {</div><div class='del'>-	      /* Make a hole.  */</div><div class='del'>-	      if (lseek (dest_desc, (off_t) n_read, SEEK_CUR) &lt; 0L)</div><div class='del'>-		{</div><div class='del'>-		  error (0, errno, "%s", dst_path);</div><div class='del'>-		  return_val = -1;</div><div class='del'>-		  goto ret;</div><div class='del'>-		}</div><div class='del'>-	      last_write_made_hole = 1;</div><div class='del'>-	    }</div><div class='del'>-	  else</div><div class='del'>-	    /* Clear to indicate that a normal write is needed. */</div><div class='del'>-	    ip = 0;</div><div class='del'>-	}</div><div class='del'>-      if (ip == 0)</div><div class='del'>-	{</div><div class='del'>-	  if (full_write (dest_desc, buf, n_read) &lt; 0)</div><div class='del'>-	    {</div><div class='del'>-	      error (0, errno, "%s", dst_path);</div><div class='del'>-	      return_val = -1;</div><div class='del'>-	      goto ret;</div><div class='del'>-	    }</div><div class='del'>-	  last_write_made_hole = 0;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  /* If the file ends with a `hole', something needs to be written at</div><div class='del'>-     the end.  Otherwise the kernel would truncate the file at the end</div><div class='del'>-     of the last write operation.  */</div><div class='del'>-</div><div class='del'>-  if (last_write_made_hole)</div><div class='del'>-    {</div><div class='del'>-#if HAVE_FTRUNCATE</div><div class='del'>-      /* Write a null character and truncate it again.  */</div><div class='del'>-      if (full_write (dest_desc, "", 1) &lt; 0</div><div class='del'>-	  || ftruncate (dest_desc, n_read_total) &lt; 0)</div><div class='del'>-#else</div><div class='del'>-      /* Seek backwards one character and write a null.  */</div><div class='del'>-      if (lseek (dest_desc, (off_t) -1, SEEK_CUR) &lt; 0L</div><div class='del'>-	  || full_write (dest_desc, "", 1) &lt; 0)</div><div class='del'>-#endif</div><div class='del'>-	{</div><div class='del'>-	  error (0, errno, "%s", dst_path);</div><div class='del'>-	  return_val = -1;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-ret:</div><div class='del'>-  if (close (dest_desc) &lt; 0)</div><div class='del'>-    {</div><div class='del'>-      error (0, errno, "%s", dst_path);</div><div class='del'>-      return_val = -1;</div><div class='del'>-    }</div><div class='del'>-ret2:</div><div class='del'>-  if (close (source_desc) &lt; 0)</div><div class='del'>-    {</div><div class='del'>-      error (0, errno, "%s", src_path);</div><div class='del'>-      return_val = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return return_val;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/MH/camel-mh-folder.h b/camel/providers/MH/camel-mh-folder.h<br/>deleted file mode 100644<br/>index 40800375eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/camel-mh-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/camel-mh-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-mh-folder.h : Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-</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'>-</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;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-/*  #include "camel-store.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)     (GTK_CHECK_CAST((obj), CAMEL_MH_FOLDER_TYPE, CamelMhFolder))</div><div class='del'>-#define CAMEL_MH_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MH_FOLDER_TYPE, CamelMhFolderClass))</div><div class='del'>-#define IS_CAMEL_MH_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_MH_FOLDER_TYPE))</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'>-	gchar *directory_path;</div><div class='del'>-	GList *file_name_list;</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-</div><div class='del'>-} CamelMhFolder;</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'>-} CamelMhFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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'>-</div><div class='del'>-#endif /* CAMEL_MH_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/MH/camel-mh-provider.c b/camel/providers/MH/camel-mh-provider.c<br/>deleted file mode 100644<br/>index 316b8a0797..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/camel-mh-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/camel-mh-provider.c</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'>-/* camel-mh-provider.c: mh provider registration code */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#include "config.h"</div><div class='del'>-#include "camel-mh-store.h"</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-log.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelProvider _mh_provider = {</div><div class='del'>-	(GtkType) 0,</div><div class='del'>-	PROVIDER_STORE,</div><div class='del'>-	"mh",</div><div class='del'>-	"Camel default mh provider",</div><div class='del'>-	"This is a very simple provider, mh is a bad protocol anyway",</div><div class='del'>-	(GModule *) NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelProvider *</div><div class='del'>-camel_provider_module_init ()</div><div class='del'>-{</div><div class='del'>-	_mh_provider.object_type = camel_mh_store_get_type();</div><div class='del'>-	return &amp;_mh_provider;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/MH/camel-mh-store.c b/camel/providers/MH/camel-mh-store.c<br/>deleted file mode 100644<br/>index 60ba07f47b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/camel-mh-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/camel-mh-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,153 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-mh-store.c : class for an mh store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#include "camel-mh-store.h"</div><div class='del'>-#include "camel-mh-folder.h"</div><div class='del'>-#include "url-util.h"</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static void _init (CamelStore *store, CamelSession *session, const gchar *url_name);</div><div class='del'>-static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_store_class_init (CamelMhStoreClass *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'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_store_get_type ());</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_store_class-&gt;init = _init;</div><div class='del'>-	camel_store_class-&gt;get_folder = _get_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'>-camel_mh_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMhStore *mh_store = CAMEL_MH_STORE (object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-	</div><div class='del'>-	store-&gt;separator = '/';</div><div class='del'>-}</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'>-camel_mh_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_mh_store_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_mh_store_type)	{</div><div class='del'>-		GtkTypeInfo camel_mh_store_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMhStore",</div><div class='del'>-			sizeof (CamelMhStore),</div><div class='del'>-			sizeof (CamelMhStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mh_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mh_store_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'>-		camel_mh_store_type = gtk_type_unique (CAMEL_STORE_TYPE, &amp;camel_mh_store_info);</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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These evil public functions are here for test only */</div><div class='del'>-void </div><div class='del'>-camel_mh_store_set_toplevel_dir (CamelMhStore *store, const gchar *toplevel)</div><div class='del'>-{</div><div class='del'>-	store-&gt;toplevel_dir = g_strdup (toplevel);</div><div class='del'>-	CAMEL_STORE(store)-&gt;separator = '/';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mh_store_get_toplevel_dir (CamelMhStore *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'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-_init (CamelStore *store, CamelSession *session, const gchar *url_name)</div><div class='del'>-{</div><div class='del'>-	CamelMhStore *mh_store = CAMEL_MH_STORE (store);</div><div class='del'>-	Gurl *store_url;</div><div class='del'>-	</div><div class='del'>-	g_assert (url_name);</div><div class='del'>-	/* call parent implementation */</div><div class='del'>-	parent_class-&gt;init (store, session, url_name);</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* find the path in the URL*/</div><div class='del'>-	store_url = g_url_new (url_name);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (store_url);</div><div class='del'>-	g_return_if_fail (store_url-&gt;path); </div><div class='del'>-	</div><div class='del'>-	mh_store-&gt;toplevel_dir = g_strdup (store_url-&gt;path); </div><div class='del'>-	g_url_free (store_url);</div><div class='del'>-</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_folder (CamelStore *store, const gchar *folder_name)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *new_mh_folder;</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-</div><div class='del'>-	/* check if folder has already been created */</div><div class='del'>-	/* call the standard routine for that when  */</div><div class='del'>-	/* it is done ... */</div><div class='del'>-</div><div class='del'>-	new_mh_folder =  gtk_type_new (CAMEL_MH_FOLDER_TYPE);</div><div class='del'>-	new_folder = CAMEL_FOLDER (new_mh_folder);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (new_folder)-&gt;init_with_store (new_folder, store, NULL);</div><div class='del'>-	CF_CLASS (new_folder)-&gt;set_name (new_folder, folder_name, NULL);</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/MH/camel-mh-store.h b/camel/providers/MH/camel-mh-store.h<br/>deleted file mode 100644<br/>index 924a5a6fc5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/camel-mh-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/camel-mh-store.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-mhstore.h : class for an mh store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-</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'>-</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;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-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)     (GTK_CHECK_CAST((obj), CAMEL_MH_STORE_TYPE, CamelMhStore))</div><div class='del'>-#define CAMEL_MH_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MH_STORE_TYPE, CamelMhStoreClass))</div><div class='del'>-#define IS_CAMEL_MH_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_MH_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'>-	gchar *toplevel_dir;	</div><div class='del'>-} CamelMhStore;</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'>-</div><div class='del'>-} CamelMhStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_mh_store_get_type (void);</div><div class='del'>-</div><div class='del'>-void camel_mh_store_set_toplevel_dir (CamelMhStore *store, const gchar *toplevel);</div><div class='del'>-const gchar *camel_mh_store_get_toplevel_dir (CamelMhStore *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_MH_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/MH/mh-summary.c b/camel/providers/MH/mh-summary.c<br/>deleted file mode 100644<br/>index 5a964696e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/mh-summary.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/mh-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,290 +0,0 @@</div><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'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-</div><div class='del'>-#include &lt;config.h&gt; </div><div class='del'>-</div><div class='del'>-#include "mh-uid.h"</div><div class='del'>-#include "camel-log.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-buffered-fs.h"</div><div class='del'>-#include "gmime-utils.h"</div><div class='del'>-#include "mh-utils.h"</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;sys/types.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;dirent.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'>-void </div><div class='del'>-mh_generate_summary (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-	CamelFolderSummary *summary;</div><div class='del'>-	CamelMessageInfo *message_info;</div><div class='del'>-	CamelFolderInfo *subfolder_info;</div><div class='del'>-	CamelStream *message_stream;</div><div class='del'>-	guint file_number;</div><div class='del'>-	gchar *message_fullpath;</div><div class='del'>-	gchar *directory_path;</div><div class='del'>-	GArray *header_array;</div><div class='del'>-	MhUidCouple *uid_couple;</div><div class='del'>-	Rfc822Header *cur_header;</div><div class='del'>-	int i;</div><div class='del'>-	int n_file;</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::generate_summary entering \n");</div><div class='del'>-</div><div class='del'>-	g_assert (folder);</div><div class='del'>-</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::generate_summary folder has no directory path\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	summary = camel_folder_summary_new ();</div><div class='del'>-	folder-&gt;summary = summary;</div><div class='del'>-</div><div class='del'>-	uid_array = mh_folder-&gt;uid_array;</div><div class='del'>-	</div><div class='del'>-	if (!uid_array) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::generate_summary "</div><div class='del'>-				      "no uid list, that probably means there is "</div><div class='del'>-				      "no message in this folder, exiting \n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	uid_couple = (MhUidCouple *)uid_array-&gt;data;</div><div class='del'>-</div><div class='del'>-	for (n_file=0; n_file&lt;uid_array-&gt;len; n_file++) {</div><div class='del'>-</div><div class='del'>-		file_number = uid_couple-&gt;file_number;</div><div class='del'>-</div><div class='del'>-		message_info = g_new0 (CamelMessageInfo, 1);</div><div class='del'>-		message_info-&gt;uid = g_new0 (guchar, 17);</div><div class='del'>-		strncpy (message_info-&gt;uid, uid_couple-&gt;uid, 16);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		message_fullpath = g_strdup_printf ("%s/%d", directory_path, file_number);</div><div class='del'>-		message_stream = camel_stream_buffered_fs_new_with_name (message_fullpath, </div><div class='del'>-									 CAMEL_STREAM_BUFFERED_FS_READ);</div><div class='del'>-		if (!message_stream) {</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::generate_summary "</div><div class='del'>-					      "could not open %d for reading\n", message_fullpath);</div><div class='del'>-			g_free (message_fullpath);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		g_free (message_fullpath);</div><div class='del'>-		</div><div class='del'>-		header_array = get_header_array_from_stream (message_stream);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (message_stream));</div><div class='del'>-		</div><div class='del'>-		for (i=0; i&lt;header_array-&gt;len; i++) {</div><div class='del'>-			cur_header = (Rfc822Header *)header_array-&gt;data + i;</div><div class='del'>-			if (!g_strcasecmp (cur_header-&gt;name, "subject")) {</div><div class='del'>-				message_info-&gt;subject = cur_header-&gt;value;</div><div class='del'>-				g_free (cur_header-&gt;name);</div><div class='del'>-			} else if (!g_strcasecmp (cur_header-&gt;name, "sender")) {</div><div class='del'>-				message_info-&gt;date = cur_header-&gt;value;</div><div class='del'>-				g_free (cur_header-&gt;name);</div><div class='del'>-			} else if (!g_strcasecmp (cur_header-&gt;name, "date")) {</div><div class='del'>-				message_info-&gt;date = cur_header-&gt;value;</div><div class='del'>-				g_free (cur_header-&gt;name);</div><div class='del'>-			} else {</div><div class='del'>-				g_free (cur_header-&gt;name);</div><div class='del'>-				g_free (cur_header-&gt;value);</div><div class='del'>-			}</div><div class='del'>-		}		</div><div class='del'>-		g_array_free (header_array, TRUE);</div><div class='del'>-</div><div class='del'>-		summary-&gt;message_info_list = g_list_append (summary-&gt;message_info_list, message_info);</div><div class='del'>-</div><div class='del'>-		/* next message in the uid list */</div><div class='del'>-		uid_couple++;</div><div class='del'>-	}	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::generate_summary leaving \n");</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'>-mh_save_summary (CamelMhFolder *mh_folder)</div><div class='del'>-{</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-	MhUidCouple *first_uid_couple;</div><div class='del'>-	CamelFolderSummary *summary;</div><div class='del'>-	GList *msg_info_list;</div><div class='del'>-	CamelMessageInfo *msg_info;</div><div class='del'>-	gchar *directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	gchar *summary_file_path;</div><div class='del'>-	gint fd;</div><div class='del'>-	gint i;</div><div class='del'>-	gint field_lgth;</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::save_summary entering \n");</div><div class='del'>-</div><div class='del'>-	summary = CAMEL_FOLDER (mh_folder)-&gt;summary;</div><div class='del'>-	if (!summary) return;</div><div class='del'>-	</div><div class='del'>-	summary_file_path = g_strdup_printf ("%s/%s", directory_path, ".camel-summary");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("In the process of writing %s\n", summary_file_path);</div><div class='del'>-	fd = open (summary_file_path, O_WRONLY | O_CREAT );</div><div class='del'>-	</div><div class='del'>-	if (!fd) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("could not open file %s for writing. Exiting.\n", summary_file_path);</div><div class='del'>-		g_free (summary_file_path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (summary_file_path);</div><div class='del'>-</div><div class='del'>-	msg_info_list = summary-&gt;message_info_list;</div><div class='del'>-	while (msg_info_list) {</div><div class='del'>-		msg_info = msg_info_list-&gt;data;</div><div class='del'>-		/* write subject */</div><div class='del'>-		field_lgth = msg_info-&gt;subject ? strlen (msg_info-&gt;subject) : 0;</div><div class='del'>-		write (fd, &amp;field_lgth, sizeof (gint));</div><div class='del'>-		if (field_lgth)</div><div class='del'>-			write (fd, msg_info-&gt;subject, field_lgth);</div><div class='del'>-</div><div class='del'>-		/* write uid */</div><div class='del'>-		field_lgth = msg_info-&gt;uid ? strlen (msg_info-&gt;uid) : 0;</div><div class='del'>-		write (fd, &amp;field_lgth, sizeof (gint));</div><div class='del'>-		if (field_lgth)</div><div class='del'>-			write (fd, msg_info-&gt;uid, field_lgth);</div><div class='del'>-</div><div class='del'>-		/* write date */</div><div class='del'>-		field_lgth = msg_info-&gt;date ? strlen (msg_info-&gt;date) : 0;</div><div class='del'>-		write (fd, &amp;field_lgth, sizeof (gint));</div><div class='del'>-		if (field_lgth)</div><div class='del'>-			write (fd, msg_info-&gt;date, field_lgth);</div><div class='del'>-</div><div class='del'>-		/* write sender */</div><div class='del'>-		field_lgth = msg_info-&gt;sender ? strlen (msg_info-&gt;sender) : 0;</div><div class='del'>-		write (fd, &amp;field_lgth, sizeof (gint));</div><div class='del'>-		if (field_lgth)</div><div class='del'>-			write (fd, msg_info-&gt;sender, field_lgth);</div><div class='del'>-</div><div class='del'>-		msg_info_list = msg_info_list-&gt;next;</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'>-	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::save_summary leaving \n");</div><div class='del'>-		</div><div class='del'>-}</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'>-mh_load_summary (CamelMhFolder *mh_folder)</div><div class='del'>-{</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-	MhUidCouple *first_uid_couple;</div><div class='del'>-	CamelFolderSummary *summary;</div><div class='del'>-	CamelMessageInfo *msg_info;</div><div class='del'>-	gchar *directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	gchar *summary_file_path;</div><div class='del'>-	gint fd;</div><div class='del'>-	gint i;</div><div class='del'>-	gint field_lgth;</div><div class='del'>-	gboolean file_eof;</div><div class='del'>-	gint stat_error;</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-</div><div class='del'>-	summary = CAMEL_FOLDER (mh_folder)-&gt;summary;</div><div class='del'>-	if (summary) return 1; /* should we regenerate it ? */</div><div class='del'>-	</div><div class='del'>-	summary_file_path = g_strdup_printf ("%s/%s", directory_path, ".camel-summary");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("In the process of reading %s\n", summary_file_path);</div><div class='del'>-	fd = open (summary_file_path, O_RDONLY);</div><div class='del'>-	/* tests if file exists */</div><div class='del'>-	stat_error = stat (summary_file_path, &amp;stat_buf);</div><div class='del'>-</div><div class='del'>-	if (!((stat_error != -1) &amp;&amp; S_ISREG (stat_buf.st_mode))) {		</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("could not open file %s for reading. Exiting.\n", summary_file_path);</div><div class='del'>-		g_free (summary_file_path);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free (summary_file_path);</div><div class='del'>-	</div><div class='del'>-	for (;;)  {</div><div class='del'>-		/* read subject */</div><div class='del'>-		file_eof = (read (fd, &amp;field_lgth, sizeof (gint)) &lt;= 0);</div><div class='del'>-		if (file_eof) break;</div><div class='del'>-		</div><div class='del'>-		</div><div class='del'>-		/* allcate a summary if needed */</div><div class='del'>-		if (!summary) </div><div class='del'>-			summary = camel_folder_summary_new ();</div><div class='del'>-		/* allocate a message info struct */</div><div class='del'>-		msg_info = g_new0 (CamelMessageInfo, 1);	</div><div class='del'>-	</div><div class='del'>-		if (!file_eof &amp;&amp; (field_lgth &gt; 0)) {			</div><div class='del'>-			msg_info-&gt;subject = g_new0 (gchar, field_lgth + 1);</div><div class='del'>-			read (fd, msg_info-&gt;subject, field_lgth);</div><div class='del'>-		} else </div><div class='del'>-			msg_info-&gt;subject = NULL;</div><div class='del'>-		</div><div class='del'>-		/* read uid */</div><div class='del'>-		if (!file_eof) file_eof = (read (fd, &amp;field_lgth, sizeof (gint)) &lt;= 0);</div><div class='del'>-		if (!file_eof &amp;&amp; (field_lgth &gt; 0)) {		</div><div class='del'>-			msg_info-&gt;uid = g_new0 (gchar, field_lgth + 1);</div><div class='del'>-			read (fd, msg_info-&gt;uid, field_lgth);</div><div class='del'>-		} else </div><div class='del'>-			msg_info-&gt;uid = NULL;</div><div class='del'>-		</div><div class='del'>-		/* read date */</div><div class='del'>-		if (!file_eof) file_eof = (read (fd, &amp;field_lgth, sizeof (gint)) &lt;= 0);</div><div class='del'>-		if (!file_eof &amp;&amp; (field_lgth &gt; 0)) {			</div><div class='del'>-			msg_info-&gt;date = g_new0 (gchar, field_lgth + 1);</div><div class='del'>-			read (fd, msg_info-&gt;date, field_lgth);</div><div class='del'>-		} else </div><div class='del'>-			msg_info-&gt;date = NULL;</div><div class='del'>-		</div><div class='del'>-		/* read sender */</div><div class='del'>-		if (!file_eof) file_eof = (read (fd, &amp;field_lgth, sizeof (gint)) &lt;= 0);</div><div class='del'>-		if (!file_eof &amp;&amp; (field_lgth &gt; 0)) {			</div><div class='del'>-			msg_info-&gt;sender = g_new0 (gchar, field_lgth + 1);</div><div class='del'>-			read (fd, msg_info-&gt;sender, field_lgth);</div><div class='del'>-		} else </div><div class='del'>-			msg_info-&gt;sender = NULL;</div><div class='del'>-</div><div class='del'>-		summary-&gt;message_info_list = g_list_prepend (summary-&gt;message_info_list, </div><div class='del'>-							     msg_info);</div><div class='del'>-	}		</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER (mh_folder)-&gt;summary = summary;</div><div class='del'>-			</div><div class='del'>-	close (fd);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/MH/mh-summary.h b/camel/providers/MH/mh-summary.h<br/>deleted file mode 100644<br/>index 27c9a21f60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/mh-summary.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/mh-summary.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'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#ifndef MH_SUMMARY_H</div><div class='del'>-#define MH_SUMMARY_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-mh-folder.h"</div><div class='del'>-</div><div class='del'>-void mh_generate_summary (CamelFolder *folder);</div><div class='del'>-void mh_save_summary (CamelMhFolder *mh_folder);</div><div class='del'>-gint mh_load_summary (CamelMhFolder *mh_folder);</div><div class='del'>-</div><div class='del'>-#endif /* MH_SUMMARY_H */</div><div class='head'>diff --git a/camel/providers/MH/mh-uid.c b/camel/providers/MH/mh-uid.c<br/>deleted file mode 100644<br/>index ebcccacd23..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/mh-uid.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/mh-uid.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'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-</div><div class='del'>-#include &lt;config.h&gt; </div><div class='del'>-</div><div class='del'>-#include "mh-uid.h"</div><div class='del'>-#include "camel-log.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-buffered-fs.h"</div><div class='del'>-#include "gmime-utils.h"</div><div class='del'>-#include "md5-utils.h"</div><div class='del'>-#include "mh-utils.h"</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;sys/types.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;dirent.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'>-void</div><div class='del'>-mh_uid_get_for_file (gchar *filename, guchar uid[16])</div><div class='del'>-{</div><div class='del'>-	CamelStream *message_stream;</div><div class='del'>-	GArray *header_array;</div><div class='del'>-	Rfc822Header *cur_header;</div><div class='del'>-	int i;</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	message_stream = camel_stream_buffered_fs_new_with_name (filename, </div><div class='del'>-								 CAMEL_STREAM_BUFFERED_FS_READ);</div><div class='del'>-	header_array = get_header_array_from_stream (message_stream);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (message_stream));</div><div class='del'>-	</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	for (i=0; i&lt;header_array-&gt;len; i++) {</div><div class='del'>-		cur_header = (Rfc822Header *)header_array-&gt;data + i;</div><div class='del'>-		if (!g_strcasecmp (cur_header-&gt;name, "subject")) {</div><div class='del'>-			md5_update (&amp;ctx, cur_header-&gt;value, strlen (cur_header-&gt;value));</div><div class='del'>-		} else if (!g_strcasecmp (cur_header-&gt;name, "sender")) {</div><div class='del'>-			md5_update (&amp;ctx, cur_header-&gt;value, strlen (cur_header-&gt;value));</div><div class='del'>-		} else if (!g_strcasecmp (cur_header-&gt;name, "date")) {</div><div class='del'>-			md5_update (&amp;ctx, cur_header-&gt;value, strlen (cur_header-&gt;value));			</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (cur_header-&gt;name);</div><div class='del'>-		g_free (cur_header-&gt;value);</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_array_free (header_array, TRUE);</div><div class='del'>-	</div><div class='del'>-	md5_final (&amp;ctx, uid);</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'>-mh_save_uid_list (CamelMhFolder *mh_folder)</div><div class='del'>-{</div><div class='del'>-	GArray *uid_array;</div><div class='del'>-	MhUidCouple *first_uid_couple;</div><div class='del'>-	gchar *directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	gchar *uidfile_path;</div><div class='del'>-	int fd;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	uidfile_path = g_strdup_printf ("%s/%s", directory_path, ".camel-uid-list");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("In the process of writing %s\n", uidfile_path);</div><div class='del'>-	fd = open (uidfile_path, O_WRONLY | O_CREAT );</div><div class='del'>-	</div><div class='del'>-	if (!fd) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("could not open file %s for writing. Exiting.\n", uidfile_path);</div><div class='del'>-		g_free (uidfile_path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (uidfile_path);</div><div class='del'>-</div><div class='del'>-	uid_array = mh_folder-&gt;uid_array;</div><div class='del'>-	first_uid_couple = (MhUidCouple *)uid_array-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* write the number of uid contained in the file */</div><div class='del'>-	write (fd, &amp;(uid_array-&gt;len), sizeof (guint));</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("%d entrie present in the list\n", uid_array-&gt;len);</div><div class='del'>-	/* now write the array of uid self */</div><div class='del'>-	write (fd, first_uid_couple, sizeof (MhUidCouple) * uid_array-&gt;len);</div><div class='del'>-	</div><div class='del'>-	close (fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-mh_load_uid_list (CamelMhFolder *mh_folder)</div><div class='del'>-{</div><div class='del'>-	GArray *new_uid_array;</div><div class='del'>-	MhUidCouple *first_uid_couple;</div><div class='del'>-	gchar *directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	gchar *uidfile_path;</div><div class='del'>-	int fd;</div><div class='del'>-	guint uid_nb;</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-	gint stat_error = 0;</div><div class='del'>-	</div><div class='del'>-	uidfile_path = g_strdup_printf ("%s/%s", directory_path, ".camel-uid-list");</div><div class='del'>-</div><div class='del'>-	/* tests if file exists */</div><div class='del'>-	stat_error = stat (uidfile_path, &amp;stat_buf);</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	if (!((stat_error != -1) &amp;&amp; S_ISREG (stat_buf.st_mode))) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::load_uid_list "</div><div class='del'>-				      "file %s does not exist. Exiting.\n", uidfile_path);</div><div class='del'>-		g_free (uidfile_path);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fd = open (uidfile_path, O_RDONLY);</div><div class='del'>-	g_free (uidfile_path);</div><div class='del'>-	if (!fd) return -1;</div><div class='del'>-	</div><div class='del'>-	if (mh_folder-&gt;uid_array) g_array_free (mh_folder-&gt;uid_array, FALSE);</div><div class='del'>-</div><div class='del'>-	/* read the number of uids in the file */</div><div class='del'>-	read (fd, &amp;uid_nb, sizeof (guint));</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("reading %d uid_entries\n", uid_nb);</div><div class='del'>-	new_uid_array = g_array_new (FALSE, FALSE, sizeof (MhUidCouple));</div><div class='del'>-	new_uid_array = g_array_set_size (new_uid_array, uid_nb);</div><div class='del'>-	first_uid_couple = (MhUidCouple *)new_uid_array-&gt;data;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	read (fd, first_uid_couple, sizeof (MhUidCouple) * uid_nb);</div><div class='del'>-	</div><div class='del'>-	mh_folder-&gt;uid_array = new_uid_array;		</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'>-gint </div><div class='del'>-mh_generate_uid_list (CamelMhFolder *mh_folder)</div><div class='del'>-{	</div><div class='del'>-	GArray *new_uid_array;</div><div class='del'>-	const gchar *directory_path;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	gchar *msg_path;</div><div class='del'>-	guint msg_count;	</div><div class='del'>-	MhUidCouple *uid_couple;</div><div class='del'>-	guint file_number;</div><div class='del'>-</div><div class='del'>-	g_assert (mh_folder);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("in the process of creating uid list \n");</div><div class='del'>-	directory_path = mh_folder-&gt;directory_path;</div><div class='del'>-	if (!directory_path) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("folder has no directory path. Exiting\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	msg_count = camel_folder_get_message_count (CAMEL_FOLDER (mh_folder), NULL);</div><div class='del'>-	if (!msg_count) {</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("no message in %s. Exiting\n", directory_path);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	new_uid_array = g_array_new (FALSE, FALSE, sizeof (MhUidCouple));</div><div class='del'>-	new_uid_array = g_array_set_size (new_uid_array, msg_count);</div><div class='del'>-	uid_couple = (MhUidCouple *)new_uid_array-&gt;data;</div><div class='del'>-</div><div class='del'>-	dir_handle = opendir (directory_path);</div><div class='del'>-	</div><div class='del'>-	/* read first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while (dir_entry != NULL) {</div><div class='del'>-</div><div class='del'>-		/* tests if the entry correspond to a message file */</div><div class='del'>-		if (mh_is_a_message_file (dir_entry-&gt;d_name, directory_path)) {</div><div class='del'>-						</div><div class='del'>-			/* get the uid for this message */</div><div class='del'>-			msg_path = g_strdup_printf ("%s/%s", directory_path, dir_entry-&gt;d_name);</div><div class='del'>-			mh_uid_get_for_file (msg_path, uid_couple-&gt;uid);</div><div class='del'>-			g_free (msg_path);</div><div class='del'>-</div><div class='del'>-			/* convert filename into file number */</div><div class='del'>-			uid_couple-&gt;file_number = atoi (dir_entry-&gt;d_name);</div><div class='del'>-			uid_couple++;</div><div class='del'>-		}</div><div class='del'>-			</div><div class='del'>-		/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-	mh_folder-&gt;uid_array = new_uid_array;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/MH/mh-uid.h b/camel/providers/MH/mh-uid.h<br/>deleted file mode 100644<br/>index 63dfe5b159..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/mh-uid.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/mh-uid.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'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#ifndef MH_UID_H</div><div class='del'>-#define MH_UID_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-mh-folder.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gchar uid[16];</div><div class='del'>-	guint file_number;</div><div class='del'>-} MhUidCouple;</div><div class='del'>-</div><div class='del'>-void mh_uid_get_for_file (gchar *filename, guchar uid[16]);</div><div class='del'>-void mh_save_uid_list (CamelMhFolder *mh_folder);</div><div class='del'>-gint mh_load_uid_list (CamelMhFolder *mh_folder);</div><div class='del'>-gint mh_generate_uid_list (CamelMhFolder *mh_folder);</div><div class='del'>-</div><div class='del'>-#endif /* MH_UID_H */</div><div class='head'>diff --git a/camel/providers/MH/mh-utils.c b/camel/providers/MH/mh-utils.c<br/>deleted file mode 100644<br/>index 51bb84bc65..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/mh-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/mh-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><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'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "mh-utils.h"</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt; </div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-mh_is_a_message_file (const gchar *file_name, const gchar *file_path)</div><div class='del'>-{</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-	gint stat_error = 0;</div><div class='del'>-	gboolean ok;</div><div class='del'>-	gchar *full_file_name;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	/* test if the name is a number */</div><div class='del'>-	i=0;</div><div class='del'>-	while ((file_name[i] != '\0') &amp;&amp; (file_name[i] &gt;= '0') &amp;&amp; (file_name[i] &lt;= '9'))</div><div class='del'>-		i++;</div><div class='del'>-	if ((i==0) || (file_name[i] != '\0')) return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* is it a regular file ? */</div><div class='del'>-	full_file_name = g_strdup_printf ("%s/%s", file_path, file_name);</div><div class='del'>-	stat_error = stat (full_file_name, &amp;stat_buf);</div><div class='del'>-	g_free (full_file_name);</div><div class='del'>-</div><div class='del'>-	return  ((stat_error != -1) &amp;&amp; S_ISREG (stat_buf.st_mode));</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/MH/mh-utils.h b/camel/providers/MH/mh-utils.h<br/>deleted file mode 100644<br/>index 968228b0a3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/MH/mh-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/MH/mh-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'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt; .</div><div class='del'>- *</div><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'>-#ifndef MH_UTILS_H</div><div class='del'>-#define MH_UTILS_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean mh_is_a_message_file (const gchar *file_name, const gchar *file_path);</div><div class='del'>-</div><div class='del'>-#endif /* MH_UTILS_H */</div><div class='head'>diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am<br/>deleted file mode 100644<br/>index dec31c0cb9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = mbox pop3 sendmail smtp vee imap</div><div class='del'>-</div><div class='del'>-# these ones are disabled for the moment.</div><div class='del'>-# MH maildir nntp smtp</div><div class='head'>diff --git a/camel/providers/imap/.cvsignore b/camel/providers/imap/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/.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/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am<br/>deleted file mode 100644<br/>index 4fc2397e62..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelimapincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelimap.la</div><div class='del'>-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)/libibex			\</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'>-	$(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-folder.c			\</div><div class='del'>-	camel-imap-provider.c			\</div><div class='del'>-	camel-imap-store.c			\</div><div class='del'>-	camel-imap-stream.c</div><div class='del'>-</div><div class='del'>-libcamelimapinclude_HEADERS =			\</div><div class='del'>-	camel-imap-folder.h			\</div><div class='del'>-	camel-imap-store.h			\</div><div class='del'>-	camel-imap-stream.h</div><div class='del'>-</div><div class='del'>-libcamelimap_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-libcamelimap_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)</div><div class='del'>-#libcamelimap_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelimap.urls</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/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c<br/>deleted file mode 100644<br/>index 51bab59eb4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1245 +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-imap-folder.c : Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Jeffrey Stedfast &lt;fejj@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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 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'>-</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-imap-folder.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-stream.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream.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-stream-buffer.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-mime-filter-crlf.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-mime-utils.h"</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 (GTK_OBJECT (o)-&gt;klass))</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void imap_init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-		       CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		       gchar *separator, gboolean path_begns_with_sep,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-#if 0</div><div class='del'>-static gboolean imap_exists (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean imap_delete (CamelFolder *folder, gboolean recurse, CamelException *ex);</div><div class='del'>-static gboolean imap_delete_messages (CamelFolder *folder, CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-static gint imap_get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void imap_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-static GPtrArray *imap_get_uids (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean imap_parse_subfolder_line (gchar *buf, gchar **flags, gchar **sep, gchar **folder);</div><div class='del'>-static GPtrArray *imap_get_subfolder_names (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GPtrArray *imap_get_summary (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void imap_free_summary (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-static CamelMimeMessage *imap_get_message_by_uid (CamelFolder *folder, const gchar *uid, </div><div class='del'>-						  CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void imap_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, </div><div class='del'>-			      CamelFolder *dest_folder, CamelException *ex);</div><div class='del'>-static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, </div><div class='del'>-				      CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void imap_delete_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *imap_summary_get_by_uid (CamelFolder *f, const char *uid);</div><div class='del'>-</div><div class='del'>-static GList *imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void imap_finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-/* flag methods */</div><div class='del'>-static guint32  imap_get_permanent_flags (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static guint32  imap_get_message_flags   (CamelFolder *folder, const char *uid, CamelException *ex);</div><div class='del'>-static void     imap_set_message_flags   (CamelFolder *folder, const char *uid, guint32 flags, guint32 set,</div><div class='del'>-					  CamelException *ex);</div><div class='del'>-static gboolean imap_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name,</div><div class='del'>-					    CamelException *ex);</div><div class='del'>-static void     imap_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name,</div><div class='del'>-					    gboolean value, CamelException *ex);</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'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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;init = imap_init;</div><div class='del'>-	camel_folder_class-&gt;sync = imap_sync;</div><div class='del'>-	camel_folder_class-&gt;expunge = imap_expunge;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_uids = imap_get_uids;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder_names = imap_get_subfolder_names;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_count = imap_get_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = imap_get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;append_message = imap_append_message;</div><div class='del'>-	camel_folder_class-&gt;delete_message_by_uid = imap_delete_message_by_uid;</div><div class='del'>-	</div><div class='del'>-	camel_folder_class-&gt;get_summary = imap_get_summary;</div><div class='del'>-	camel_folder_class-&gt;summary_get_by_uid = imap_summary_get_by_uid;</div><div class='del'>-	camel_folder_class-&gt;free_summary = imap_free_summary;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = imap_search_by_expression;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_permanent_flags = imap_get_permanent_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_flags = imap_get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = imap_set_message_flags;</div><div class='del'>-	/*camel_folder_class-&gt;get_message_user_flags = imap_get_message_user_flags;*/</div><div class='del'>-	/*camel_folder_class-&gt;set_message_user_flags = imap_set_message_user_flags;*/</div><div class='del'>-</div><div class='del'>-	gtk_object_class-&gt;finalize = imap_finalize;	</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;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = TRUE;</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-	folder-&gt;has_search_capability = FALSE; /* default - we have to query IMAP to know for sure */</div><div class='del'>-</div><div class='del'>-	imap_folder-&gt;summary = NULL;</div><div class='del'>-	imap_folder-&gt;count = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_imap_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_imap_folder_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_imap_folder_type)	{</div><div class='del'>-		GtkTypeInfo camel_imap_folder_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelImapFolder",</div><div class='del'>-			sizeof (CamelImapFolder),</div><div class='del'>-			sizeof (CamelImapFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_imap_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_imap_folder_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'>-		camel_imap_folder_type = gtk_type_unique (CAMEL_FOLDER_TYPE, &amp;camel_imap_folder_info);</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, char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (gtk_object_new (camel_imap_folder_get_type (), NULL));</div><div class='del'>-	</div><div class='del'>-	CF_CLASS (folder)-&gt;init (folder, parent, NULL, folder_name, "/", FALSE, ex);</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'>-imap_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	/* TODO: do we need to do more here? */</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	gint i, max;</div><div class='del'>-	</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;finalize (object);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (imap_folder-&gt;summary != NULL);</div><div class='del'>-	</div><div class='del'>-	max = imap_folder-&gt;summary-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; max; i++) {</div><div class='del'>-		info = g_ptr_array_index (imap_folder-&gt;summary, i);</div><div class='del'>-		g_free (info-&gt;subject);</div><div class='del'>-		g_free (info-&gt;to);</div><div class='del'>-		g_free (info-&gt;from);</div><div class='del'>-		g_free (info-&gt;uid);</div><div class='del'>-		g_free (info);</div><div class='del'>-		info = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (imap_folder-&gt;summary, TRUE);</div><div class='del'>-	imap_folder-&gt;summary = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-imap_init (CamelFolder *folder, CamelStore *parent_store, CamelFolder *parent_folder,</div><div class='del'>-	   const gchar *name, gchar *separator, gboolean path_begins_with_sep, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (parent_store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	int status;</div><div class='del'>-	char *result, *folder_path;</div><div class='del'>-	</div><div class='del'>-	/* call parent method */</div><div class='del'>-	parent_class-&gt;init (folder, parent_store, parent_folder, name, separator, path_begins_with_sep, ex);</div><div class='del'>-	if (camel_exception_get_id (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* we assume that the parent init</div><div class='del'>-	   method checks for the existance of @folder */</div><div class='del'>-	folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = TRUE;</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-</div><div class='del'>-	/* now lets find out if we can do searches... */</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "CAPABILITY");</div><div class='del'>-	</div><div class='del'>-	/* ugh, I forgot that CAPABILITY doesn't have a response code */</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not get capabilities on IMAP server %s: %s.",</div><div class='del'>-				      service-&gt;url-&gt;host, </div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (strstrcase (result, "SEARCH"))</div><div class='del'>-		folder-&gt;has_search_capability = TRUE;</div><div class='del'>-	else</div><div class='del'>-		folder-&gt;has_search_capability = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "IMAP provider does%shave SEARCH support\n", folder-&gt;has_search_capability ? " " : "n't ");</div><div class='del'>-	</div><div class='del'>-        /* some IMAP daemons support user-flags           *</div><div class='del'>-	 * I would not, however, rely on this feature as  *</div><div class='del'>-	 * most IMAP daemons are not 100% RFC compliant   */</div><div class='del'>-	folder-&gt;permanent_flags = CAMEL_MESSAGE_SEEN |</div><div class='del'>-		CAMEL_MESSAGE_ANSWERED |</div><div class='del'>-		CAMEL_MESSAGE_FLAGGED |</div><div class='del'>-		CAMEL_MESSAGE_DELETED |</div><div class='del'>-		CAMEL_MESSAGE_DRAFT |</div><div class='del'>-		CAMEL_MESSAGE_USER;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>- 	imap_folder-&gt;search = NULL;</div><div class='del'>-	imap_folder-&gt;summary = NULL;</div><div class='del'>-</div><div class='del'>-	/* SELECT the IMAP mail spool */</div><div class='del'>-	if (url &amp;&amp; url-&gt;path &amp;&amp; *(url-&gt;path + 1) &amp;&amp; strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-		folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-	else</div><div class='del'>-		folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "SELECT %s", folder_path);</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not SELECT %s on IMAP server %s: %s.",</div><div class='del'>-				      folder-&gt;full_name, service-&gt;url-&gt;host, </div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-	} else {</div><div class='del'>-		/* parse the mode we opened it in */</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-	g_free (folder_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	gint i, max;</div><div class='del'>-</div><div class='del'>-	/* uhhh...this is kinda unsafe so we'll leave it blocked out */</div><div class='del'>-	if (imap_folder-&gt;summary) {</div><div class='del'>-		max = imap_folder-&gt;summary-&gt;len;</div><div class='del'>-		for (i = 0; i &lt; max; i++) {</div><div class='del'>-			CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-			info = (CamelMessageInfo *) g_ptr_array_index (imap_folder-&gt;summary, i);</div><div class='del'>-			if (info-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) {</div><div class='del'>-				char *flags;</div><div class='del'>-				</div><div class='del'>-				flags = g_strconcat (info-&gt;flags &amp; CAMEL_MESSAGE_SEEN ? "\\Seen " : "",</div><div class='del'>-						     info-&gt;flags &amp; CAMEL_MESSAGE_DRAFT ? "\\Draft " : "",</div><div class='del'>-						     info-&gt;flags &amp; CAMEL_MESSAGE_DELETED ? "\\Deleted " : "",</div><div class='del'>-						     info-&gt;flags &amp; CAMEL_MESSAGE_DELETED ? "\\Answered " : "",</div><div class='del'>-						     NULL);</div><div class='del'>-				if (*flags) {</div><div class='del'>-					gchar *result;</div><div class='del'>-					gint s;</div><div class='del'>-					</div><div class='del'>-					*(flags + strlen (flags) - 1) = '\0';</div><div class='del'>-					s = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store),</div><div class='del'>-									 folder, &amp;result,</div><div class='del'>-									 "UID STORE %s FLAGS.SILENT (%s)",</div><div class='del'>-									 info-&gt;uid, flags);</div><div class='del'>-					</div><div class='del'>-					if (s != CAMEL_IMAP_OK) {</div><div class='del'>-						CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-						camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-								      "Could not set flags on message %s on IMAP "</div><div class='del'>-								      "server %s: %s.", info-&gt;uid,</div><div class='del'>-								      service-&gt;url-&gt;host,</div><div class='del'>-								      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-								      "Unknown error");</div><div class='del'>-						g_free (result);</div><div class='del'>-						return;</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					g_free(result);</div><div class='del'>-				}</div><div class='del'>-				g_free (flags);</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'>-	if (expunge)</div><div class='del'>-		imap_expunge (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gchar *result;</div><div class='del'>-	gint status;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (folder != NULL);</div><div class='del'>-	</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "EXPUNGE");</div><div class='del'>-	</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not EXPUNGE from IMAP server %s: %s.",</div><div class='del'>-				      service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free(result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static gboolean</div><div class='del'>-imap_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* TODO: code this &amp; what should this do? delete messages or the folder? */</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	gboolean folder_already_exists;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (folder != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	/* check if the folder object exists */</div><div class='del'>-</div><div class='del'>-	/* in the case where the folder does not exist, </div><div class='del'>-	   return immediatly */</div><div class='del'>-	folder_already_exists = camel_folder_exists (folder, ex);</div><div class='del'>-	if (camel_exception_get_id (ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (!folder_already_exists)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* call default implementation.</div><div class='del'>-	   It should delete the messages in the folder</div><div class='del'>-	   and recurse the operation to subfolders */</div><div class='del'>-	parent_class-&gt;delete (folder, recurse, ex);</div><div class='del'>-	if (camel_exception_get_id (ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (!(folder-&gt;full_name || folder-&gt;name)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-				     "invalid folder path. Use set_name ?");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-        /* delete the directory - we must start with the leaves and work</div><div class='del'>-	   back to the root if we are to delete recursively */</div><div class='del'>-</div><div class='del'>-	/* TODO: Finish this... */</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-imap_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	gchar *result, *msg_count, *folder_path;</div><div class='del'>-	gint status;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (folder != NULL, -1);</div><div class='del'>-</div><div class='del'>-	/* If we already have a count, return */</div><div class='del'>-	if (imap_folder-&gt;count != -1)</div><div class='del'>-		return imap_folder-&gt;count;</div><div class='del'>-</div><div class='del'>-	if (url &amp;&amp; url-&gt;path &amp;&amp; *(url-&gt;path + 1) &amp;&amp; strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-		folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-	else</div><div class='del'>-		folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-	</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "STATUS %s (MESSAGES)", folder_path);</div><div class='del'>-</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not get message count for %s from IMAP "</div><div class='del'>-				      "server %s: %s.", folder_path, service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free (folder_path);</div><div class='del'>-</div><div class='del'>-	/* parse out the message count - should come in the form: "* STATUS &lt;folder&gt; (MESSAGES &lt;count&gt;)\r\n" */</div><div class='del'>-	if (result &amp;&amp; *result == '*') {</div><div class='del'>-		if ((msg_count = strstr (result, "MESSAGES")) != NULL) {</div><div class='del'>-			msg_count += strlen ("MESSAGES") + 1;</div><div class='del'>-</div><div class='del'>-			for ( ; *msg_count == ' '; msg_count++);</div><div class='del'>-			</div><div class='del'>-			/* we should now be pointing to the message count */</div><div class='del'>-			imap_folder-&gt;count = atoi (msg_count);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	return imap_folder-&gt;count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TODO: Optimize this later - there may be times when moving/copying a message from the</div><div class='del'>-   same IMAP store in which case we'd want to use IMAP's COPY command */</div><div class='del'>-static void</div><div class='del'>-imap_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	CamelStreamMem *mem;</div><div class='del'>-	gchar *result, *folder_path;</div><div class='del'>-	gint status;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (folder != NULL);</div><div class='del'>-	g_return_if_fail (message != NULL);</div><div class='del'>-</div><div class='del'>-	/* write the message to a CamelStreamMem so we can get it's size */</div><div class='del'>-	mem = CAMEL_STREAM_MEM (camel_stream_mem_new());</div><div class='del'>-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (mem)) == -1) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not APPEND message to IMAP server %s: %s.",</div><div class='del'>-				      service-&gt;url-&gt;host,</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-</div><div class='del'>-	        return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mem-&gt;buffer = g_byte_array_append (mem-&gt;buffer, g_strdup("\r\n"), 3);</div><div class='del'>-	</div><div class='del'>-	if (url &amp;&amp; url-&gt;path &amp;&amp; *(url-&gt;path + 1) &amp;&amp; strcmp(folder-&gt;full_name, "INBOX"))</div><div class='del'>-		folder_path = g_strdup_printf ("%s/%s", url-&gt;path, folder-&gt;full_name);</div><div class='del'>-	else</div><div class='del'>-		folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-	</div><div class='del'>-	status = camel_imap_command (CAMEL_IMAP_STORE (folder-&gt;parent_store),</div><div class='del'>-				     folder, &amp;result,</div><div class='del'>-				     "APPEND %s (\\Seen) {%d}\r\n%s",</div><div class='del'>-				     folder_path,</div><div class='del'>-				     mem-&gt;buffer-&gt;len,</div><div class='del'>-				     mem-&gt;buffer-&gt;data);</div><div class='del'>-</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not APPEND message to IMAP server %s: %s.",</div><div class='del'>-				      service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (result);</div><div class='del'>-	g_free (folder_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_get_uids (CamelFolder *folder, CamelException *ex) </div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *array, *infolist;</div><div class='del'>-	gint i, count;</div><div class='del'>-</div><div class='del'>-	infolist = imap_get_summary (folder, ex);</div><div class='del'>-	count = infolist-&gt;len;</div><div class='del'>-	</div><div class='del'>-	array = g_ptr_array_new ();</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'>-		info = (CamelMessageInfo *) g_ptr_array_index (infolist, i);</div><div class='del'>-		array-&gt;pdata[i] = g_strdup (info-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imap_free_summary (folder, infolist);</div><div class='del'>-	</div><div class='del'>-	return array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_parse_subfolder_line (gchar *buf, gchar **flags, gchar **sep, gchar **folder)</div><div class='del'>-{</div><div class='del'>-	gchar *ptr, *eptr;</div><div class='del'>-</div><div class='del'>-	*flags = NULL;</div><div class='del'>-	*sep = NULL;</div><div class='del'>-	*folder = NULL;</div><div class='del'>-</div><div class='del'>-	if (strncasecmp (buf, "* LIST", 6))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	ptr = strstr (buf + 6, "(");</div><div class='del'>-	if (!ptr)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	ptr++;</div><div class='del'>-	eptr = strstr (ptr, ")");</div><div class='del'>-	if (!eptr)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	*flags = g_strndup (ptr, (gint)(eptr - ptr));</div><div class='del'>-</div><div class='del'>-	ptr = strstr (eptr, "\"");</div><div class='del'>-	if (!ptr)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	ptr++;</div><div class='del'>-	eptr = strstr (ptr, "\"");</div><div class='del'>-	if (!eptr)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	*sep = g_strndup (ptr, (gint)(eptr - ptr));</div><div class='del'>-</div><div class='del'>-	ptr = eptr + 1;</div><div class='del'>-	*folder = g_strdup (ptr);</div><div class='del'>-	g_strstrip (*folder);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_get_subfolder_names (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	GPtrArray *listing;</div><div class='del'>-	gint status;</div><div class='del'>-	gchar *result, *folder_path;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (folder != NULL, g_ptr_array_new());</div><div class='del'>-	</div><div class='del'>-	if (imap_folder-&gt;count != -1)</div><div class='del'>-		return g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	if (url &amp;&amp; url-&gt;path) {</div><div class='del'>-		if (!strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-			folder_path = g_strdup (url-&gt;path + 1);</div><div class='del'>-		else</div><div class='del'>-			folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-	} else {</div><div class='del'>-		folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "LIST \"\" \"%s%s\"", folder_path,</div><div class='del'>-					      *folder_path ? "/*" : "*");</div><div class='del'>-	</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not get subfolder listing from IMAP "</div><div class='del'>-				      "server %s: %s.", service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		return g_ptr_array_new ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* parse out the subfolders */</div><div class='del'>-	listing = g_ptr_array_new ();</div><div class='del'>-	if (result) {</div><div class='del'>-		char *ptr = result;</div><div class='del'>-		</div><div class='del'>-		while (ptr &amp;&amp; *ptr == '*') {</div><div class='del'>-			gchar *flags, *sep, *folder, *buf, *end, *f;</div><div class='del'>-			gboolean ret;</div><div class='del'>-			</div><div class='del'>-			for (end = ptr; *end &amp;&amp; *end != '\n'; end++);</div><div class='del'>-			buf = g_strndup (ptr, (gint)(end - ptr));</div><div class='del'>-			ptr = end;</div><div class='del'>-			</div><div class='del'>-			ret = imap_parse_subfolder_line (buf, &amp;flags, &amp;sep, &amp;folder);</div><div class='del'>-			g_free (buf);</div><div class='del'>-			</div><div class='del'>-			if (!ret || (flags &amp;&amp; strstr (flags, "NoSelect"))) {</div><div class='del'>-				g_free (flags);</div><div class='del'>-				g_free (sep);</div><div class='del'>-				g_free (folder);</div><div class='del'>-</div><div class='del'>-				if (*ptr == '\n')</div><div class='del'>-					ptr++;</div><div class='del'>-				</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			g_free (flags);</div><div class='del'>-</div><div class='del'>-			/* chop out the folder prefix */</div><div class='del'>-			if (*folder_path &amp;&amp; !strncmp (folder, folder_path, strlen (folder_path))) {</div><div class='del'>-				f = folder + strlen (folder_path) + 1;</div><div class='del'>-				memmove (folder, f, strlen (f) + 1);</div><div class='del'>-			}</div><div class='del'>-			printf ("adding folder: %s\n", folder);</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (listing, folder);</div><div class='del'>-</div><div class='del'>-			g_free (sep);  /* TODO: decide if we really need dir_sep */</div><div class='del'>-			</div><div class='del'>-			if (*ptr == '\n')</div><div class='del'>-				ptr++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-	g_free (folder_path);</div><div class='del'>-</div><div class='del'>-	return listing;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_delete_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	if (!(info = (CamelMessageInfo *)imap_summary_get_by_uid (folder, uid))) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not set flags for message %s on IMAP server %s: %s",</div><div class='del'>-				      uid, service-&gt;url-&gt;host, "Unknown error");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;flags |= CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-imap_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStream *msgstream;</div><div class='del'>-	/*CamelStreamFilter *f_stream;*/</div><div class='del'>-	/*CamelMimeFilter *filter;*/</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	/*CamelMimePart *part;*/</div><div class='del'>-	gchar *result, *header, *body, *mesg, *p;</div><div class='del'>-	int id, status, part_len;</div><div class='del'>-</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "UID FETCH %s BODY.PEEK[HEADER]", uid);</div><div class='del'>-</div><div class='del'>-	if (!result || status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not fetch message %s on IMAP server %s: %s",</div><div class='del'>-				      uid, service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		return camel_mime_message_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (p = result; *p &amp;&amp; *p != '{' &amp;&amp; *p != '\n'; p++);</div><div class='del'>-	if (*p != '{') {</div><div class='del'>-		g_free (result);</div><div class='del'>-		return camel_mime_message_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        part_len = atoi (p + 1);</div><div class='del'>-	for ( ; *p &amp;&amp; *p != '\n'; p++);</div><div class='del'>-	if (*p != '\n') {</div><div class='del'>-		g_free (result);</div><div class='del'>-		return camel_mime_message_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	header = g_strndup (p, part_len);</div><div class='del'>-	for (p = header + strlen (header) - 1; p &gt; header &amp;&amp; *p != ')'; p--);</div><div class='del'>-	if (p != header)</div><div class='del'>-		*p = '\0';</div><div class='del'>-	g_free (result);</div><div class='del'>-	printf ("*** We got the header ***\n");</div><div class='del'>-</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "UID FETCH %s BODY[TEXT]", uid);</div><div class='del'>-</div><div class='del'>-	if (!result || status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not fetch message %s on IMAP server %s: %s",</div><div class='del'>-				      uid, service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (header);</div><div class='del'>-		return camel_mime_message_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (p = result; *p &amp;&amp; *p != '{' &amp;&amp; *p != '\n'; p++);</div><div class='del'>-	if (*p != '{') {</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (header);</div><div class='del'>-		return camel_mime_message_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        part_len = atoi (p + 1);</div><div class='del'>-	for ( ; *p &amp;&amp; *p != '\n'; p++);</div><div class='del'>-	if (*p != '\n') {</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (header);</div><div class='del'>-		return camel_mime_message_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	body = g_strndup (p, part_len);</div><div class='del'>-	for (p = body + strlen (body) - 1; p &gt; body &amp;&amp; *p != ')'; p--);</div><div class='del'>-	*p = '\0';</div><div class='del'>-	g_free (result);</div><div class='del'>-	printf ("*** We got the body ***\n");</div><div class='del'>-</div><div class='del'>-	mesg = g_strdup_printf ("%s%s", header, body);</div><div class='del'>-	g_free (header);</div><div class='del'>-	g_free (body);</div><div class='del'>-	printf ("*** We got the mesg ***\n");</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "Message:\n%s\n", mesg);</div><div class='del'>-</div><div class='del'>-	msgstream = camel_stream_mem_new_with_buffer (mesg, strlen (mesg) + 1);</div><div class='del'>-#if 0</div><div class='del'>-	f_stream = camel_stream_filter_new_with_stream (msgstream);</div><div class='del'>-	filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);</div><div class='del'>-	id = camel_stream_filter_add (f_stream, CAMEL_MIME_FILTER (filter));</div><div class='del'>-#endif	</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	printf ("*** We created the camel_mime_message ***\n");</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), msgstream);</div><div class='del'>-#if 0	</div><div class='del'>-	camel_stream_filter_remove (f_stream, id);</div><div class='del'>-	camel_stream_close (CAMEL_STREAM (f_stream));</div><div class='del'>-#endif</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (msgstream));</div><div class='del'>-	/*gtk_object_unref (GTK_OBJECT (f_stream));*/</div><div class='del'>-</div><div class='del'>-	printf ("*** We're returning... ***\n");</div><div class='del'>-	</div><div class='del'>-	return msg;</div><div class='del'>-	</div><div class='del'>-#if 0</div><div class='del'>-	CamelStream *imap_stream;</div><div class='del'>-	CamelStream *msgstream;</div><div class='del'>-	CamelStreamFilter *f_stream;   /* will be used later w/ crlf filter */</div><div class='del'>-	CamelMimeFilter *filter;       /* crlf/dot filter */</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelDataWrapper *cdw;</div><div class='del'>-	gchar *cmdbuf;</div><div class='del'>-	int id;</div><div class='del'>-	</div><div class='del'>-	/* TODO: fetch the correct part, get rid of the hard-coded stuff */</div><div class='del'>-	cmdbuf = g_strdup_printf ("UID FETCH %s BODY[TEXT]", uid);</div><div class='del'>-	imap_stream = camel_imap_stream_new (CAMEL_IMAP_FOLDER (folder), cmdbuf);</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Temp hack - basically we read in the entire message instead of getting a part as it's needed */</div><div class='del'>-	msgstream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write_to_stream (CAMEL_STREAM (imap_stream), msgstream);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (imap_stream));</div><div class='del'>-	</div><div class='del'>-	f_stream = camel_stream_filter_new_with_stream (msgstream);</div><div class='del'>-	filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);</div><div class='del'>-	id = camel_stream_filter_add (f_stream, CAMEL_MIME_FILTER (filter));</div><div class='del'>-	</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	</div><div class='del'>-	/*cdw = camel_data_wrapper_new ();*/</div><div class='del'>-	/*camel_data_wrapper_construct_from_stream (cdw, CAMEL_STREAM (f_stream));*/</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), CAMEL_STREAM (f_stream));</div><div class='del'>-	</div><div class='del'>-	camel_stream_filter_remove (f_stream, id);</div><div class='del'>-	camel_stream_close (CAMEL_STREAM (f_stream));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (msgstream));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (f_stream));</div><div class='del'>-	</div><div class='del'>-	/*camel_data_wrapper_set_mime_type (cdw, "text/plain");*/</div><div class='del'>-</div><div class='del'>-	/*camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (cdw));*/</div><div class='del'>-	/*gtk_object_unref (GTK_OBJECT (cdw));*/</div><div class='del'>-	</div><div class='del'>-	return msg;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This probably shouldn't go here...but it will for now */</div><div class='del'>-static gchar *</div><div class='del'>-get_header_field (gchar *header, gchar *field)</div><div class='del'>-{</div><div class='del'>-	gchar *part, *index, *p, *q;</div><div class='del'>-</div><div class='del'>-	index = strstrcase (header, field);</div><div class='del'>-	if (index == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	p = index + strlen (field) + 1;</div><div class='del'>-	for (q = p; *q; q++)</div><div class='del'>-		if (*q == '\n' &amp;&amp; (*(q + 1) != ' ' || *(q + 1) != '\t'))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	part = g_strndup (p, (gint)(q - p));</div><div class='del'>-</div><div class='del'>-	/* it may be wrapped on multiple lines, so lets strip out \n's */</div><div class='del'>-	for (p = part; *p; ) {</div><div class='del'>-		if (*p == '\r' || *p == '\n')</div><div class='del'>-			memmove(p, p + 1, strlen (p) - 1);</div><div class='del'>-		else</div><div class='del'>-			p++;</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'>-GPtrArray *</div><div class='del'>-imap_get_summary (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	GPtrArray *array = NULL;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	gint num, i = 0, status = 0;</div><div class='del'>-	char *result, *datestr, *p, *q;</div><div class='del'>-</div><div class='del'>-	if (imap_folder-&gt;summary)</div><div class='del'>-		return imap_folder-&gt;summary;</div><div class='del'>-	</div><div class='del'>-	num = imap_get_message_count (folder, ex);</div><div class='del'>-	</div><div class='del'>-	array = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	for (i = 1; i &lt;= num; i++) {</div><div class='del'>-		status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-						      &amp;result, "FETCH %d BODY.PEEK[HEADER]", i);</div><div class='del'>-		</div><div class='del'>-		if (status != CAMEL_IMAP_OK) {</div><div class='del'>-			CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      "Could not get summary for %s on IMAP server %s: %s",</div><div class='del'>-					      folder-&gt;full_name, service-&gt;url-&gt;host,</div><div class='del'>-					      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-					      "Unknown error");</div><div class='del'>-			g_free (result);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		info = g_malloc0 (sizeof (CamelMessageInfo));</div><div class='del'>-		info-&gt;subject = get_header_field (result, "\nSubject:");</div><div class='del'>-		info-&gt;to = get_header_field (result, "\nTo:");</div><div class='del'>-		info-&gt;from = get_header_field (result, "\nFrom:");</div><div class='del'>-</div><div class='del'>-		datestr = get_header_field (result, "\nDate:");</div><div class='del'>-		info-&gt;date_sent = header_decode_date (datestr, NULL);</div><div class='del'>-		g_free (datestr);</div><div class='del'>-		g_free (result);</div><div class='del'>-</div><div class='del'>-		/* now to get the UID */</div><div class='del'>-		status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-						      &amp;result, "FETCH %d UID", i);</div><div class='del'>-		</div><div class='del'>-		if (status != CAMEL_IMAP_OK) {</div><div class='del'>-			CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      "Could not get summary for %s on IMAP server %s: %s",</div><div class='del'>-					      folder-&gt;full_name, service-&gt;url-&gt;host,</div><div class='del'>-					      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-					      "Unknown error");</div><div class='del'>-			g_free (result);</div><div class='del'>-</div><div class='del'>-			g_free (info-&gt;subject);</div><div class='del'>-			g_free (info-&gt;to);</div><div class='del'>-			g_free (info-&gt;from);</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'>-</div><div class='del'>-		if (!result || *result != '*') {</div><div class='del'>-			g_free (result);</div><div class='del'>-			fprintf (stderr, "Warning: UID for message %d not found\n", i);</div><div class='del'>-</div><div class='del'>-			g_free (info-&gt;subject);</div><div class='del'>-			g_free (info-&gt;to);</div><div class='del'>-			g_free (info-&gt;from);</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'>-</div><div class='del'>-		p = strchr (result, '(');</div><div class='del'>-		if (!p || strncasecmp (p + 1, "UID", 3)) {</div><div class='del'>-			g_free (result);</div><div class='del'>-			fprintf (stderr, "Warning: UID for message %d not found\n", i);</div><div class='del'>-</div><div class='del'>-			g_free (info-&gt;subject);</div><div class='del'>-			g_free (info-&gt;to);</div><div class='del'>-			g_free (info-&gt;from);</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'>-</div><div class='del'>-		for (p += 4; *p &amp;&amp; (*p &lt; '0' || *p &gt; '9'); p++);    /* advance to &lt;uid&gt; */</div><div class='del'>-		for (q = p; *q &amp;&amp; *q != ')' &amp;&amp; *q != ' '; q++);     /* find the end of the &lt;uid&gt; */</div><div class='del'>-		info-&gt;uid = g_strndup (p, (gint)(q - p));</div><div class='del'>-		printf ("*** info-&gt;uid = %s\n", info-&gt;uid);</div><div class='del'>-		g_free (result);</div><div class='del'>-		</div><div class='del'>-		/* now to get the flags */</div><div class='del'>-		status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-						      &amp;result, "FETCH %d FLAGS", i);</div><div class='del'>-		</div><div class='del'>-		if (status != CAMEL_IMAP_OK) {</div><div class='del'>-			CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      "Could not get summary for %s on IMAP server %s: %s",</div><div class='del'>-					      folder-&gt;full_name, service-&gt;url-&gt;host,</div><div class='del'>-					      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-					      "Unknown error");</div><div class='del'>-			g_free (result);</div><div class='del'>-</div><div class='del'>-			g_free (info-&gt;subject);</div><div class='del'>-			g_free (info-&gt;to);</div><div class='del'>-			g_free (info-&gt;from);</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'>-</div><div class='del'>-		if (!result || *result != '*') {</div><div class='del'>-			g_free (result);</div><div class='del'>-			fprintf (stderr, "Warning: FLAGS for message %d not found\n", i);</div><div class='del'>-</div><div class='del'>-			g_free (info-&gt;subject);</div><div class='del'>-			g_free (info-&gt;to);</div><div class='del'>-			g_free (info-&gt;from);</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'>-</div><div class='del'>-		p = strchr (result, '(') + 1;</div><div class='del'>-		if (strncasecmp (p, "FLAGS", 5)) {</div><div class='del'>-			g_free (result);</div><div class='del'>-			fprintf (stderr, "Warning: FLAGS for message %d not found\n", i);</div><div class='del'>-</div><div class='del'>-			g_free (info-&gt;subject);</div><div class='del'>-			g_free (info-&gt;to);</div><div class='del'>-			g_free (info-&gt;from);</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'>-</div><div class='del'>-		/* now we gotta parse for the flags */</div><div class='del'>-		info-&gt;flags = 0;</div><div class='del'>-		if (strstr (p, "\\Seen"))</div><div class='del'>-			info-&gt;flags |= CAMEL_MESSAGE_SEEN;</div><div class='del'>-		if (strstr (p, "\\Answered"))</div><div class='del'>-			info-&gt;flags |= CAMEL_MESSAGE_ANSWERED;</div><div class='del'>-		if (strstr (p, "\\Flagged"))</div><div class='del'>-			info-&gt;flags |= CAMEL_MESSAGE_FLAGGED;</div><div class='del'>-		if (strstr (p, "\\Deleted"))</div><div class='del'>-			info-&gt;flags |= CAMEL_MESSAGE_DELETED;</div><div class='del'>-		if (strstr (p, "\\Draft"))</div><div class='del'>-			info-&gt;flags |= CAMEL_MESSAGE_DRAFT;</div><div class='del'>-</div><div class='del'>-		g_free (result);</div><div class='del'>-</div><div class='del'>-		g_ptr_array_add (array, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imap_folder-&gt;summary = array;</div><div class='del'>-	</div><div class='del'>-	return array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-imap_free_summary (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get a single message info, by uid */</div><div class='del'>-static const CamelMessageInfo *</div><div class='del'>-imap_summary_get_by_uid (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelMessageInfo *info = NULL;</div><div class='del'>-	char *result, *datestr, *p;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	/* lets first check to see if we have the message info cached */</div><div class='del'>-	if (imap_folder-&gt;summary) {</div><div class='del'>-		int max, i;</div><div class='del'>-</div><div class='del'>-		max = imap_folder-&gt;summary-&gt;len;</div><div class='del'>-		for (i = 0; i &lt; max; i++) {</div><div class='del'>-			info = g_ptr_array_index (imap_folder-&gt;summary, i);</div><div class='del'>-			if (!strcmp(info-&gt;uid, uid))</div><div class='del'>-				return info;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we don't have a cached copy, so fetch it */</div><div class='del'>-	</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "UID FETCH %s BODY.PEEK[HEADER]", uid);</div><div class='del'>-</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		g_free (result);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info = g_malloc0 (sizeof (CamelMessageInfo));</div><div class='del'>-	info-&gt;subject = get_header_field (result, "\nSubject:");</div><div class='del'>-	info-&gt;to = get_header_field (result, "\nTo:");</div><div class='del'>-	info-&gt;from = get_header_field (result, "\nFrom:");</div><div class='del'>-	</div><div class='del'>-	datestr = get_header_field (result, "\nDate:");</div><div class='del'>-	info-&gt;date_sent = header_decode_date (datestr, NULL);</div><div class='del'>-	g_free (datestr);</div><div class='del'>-	</div><div class='del'>-	info-&gt;uid = g_strdup (uid);</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	/* now to get the flags */</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "UID FETCH %s FLAGS", uid);</div><div class='del'>-	</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		g_free (result);</div><div class='del'>-		fprintf (stderr, "Warning: Error getting FLAGS for message %s\n", uid);</div><div class='del'>-		</div><div class='del'>-		return info; /* I guess we should return what we got so far? */</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!result || *result != '*') {</div><div class='del'>-		g_free (result);</div><div class='del'>-		fprintf (stderr, "Warning: FLAGS for message %s not found\n", uid);</div><div class='del'>-</div><div class='del'>-		return info; /* I guess we should return what we got so far? */</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	p = strchr (result, '(') + 1;</div><div class='del'>-	if (strncasecmp (p, "FLAGS", 5)) {</div><div class='del'>-		g_free (result);</div><div class='del'>-		fprintf (stderr, "Warning: FLAGS for message %s not found\n", uid);</div><div class='del'>-</div><div class='del'>-		return info; /* I guess we should return what we got so far? */</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* now we gotta parse for the flags */</div><div class='del'>-	info-&gt;flags = 0;</div><div class='del'>-	if (strstr (p, "\\Seen"))</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_SEEN;</div><div class='del'>-	if (strstr (p, "\\Answered"))</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_ANSWERED;</div><div class='del'>-	if (strstr (p, "\\Flagged"))</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FLAGGED;</div><div class='del'>-	if (strstr (p, "\\Deleted"))</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_DELETED;</div><div class='del'>-	if (strstr (p, "\\Draft"))</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_DRAFT;</div><div class='del'>-</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	/* since we didn't have it cached, lets add it to our cache */</div><div class='del'>-	if (imap_folder-&gt;summary) {</div><div class='del'>-		g_ptr_array_add (imap_folder-&gt;summary, info);</div><div class='del'>-	} else {</div><div class='del'>-		imap_folder-&gt;summary = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_add (imap_folder-&gt;summary, info);</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'>-static GList *</div><div class='del'>-imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-#if 0</div><div class='del'>-	/* NOTE: This is experimental code... */</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	char *result;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	if (!imap_folder-&gt;has_search_capability)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), folder,</div><div class='del'>-					      &amp;result, "SEARCH %s", expression);</div><div class='del'>-	</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not get summary for %s on IMAP server %s: %s",</div><div class='del'>-				      folder-&gt;full_name, service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now to parse @result */</div><div class='del'>-#endif	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-imap_get_permanent_flags (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* return permamnant flags */</div><div class='del'>-	return folder-&gt;permanent_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-imap_get_message_flags (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	if (!(info = (CamelMessageInfo *)imap_summary_get_by_uid (folder, uid))) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not get flags for message %s on IMAP server %s: %s",</div><div class='del'>-				      uid, service-&gt;url-&gt;host, "Unknown error");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return info-&gt;flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	if (!(info = (CamelMessageInfo *)imap_summary_get_by_uid (folder, uid))) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not set flags for message %s on IMAP server %s: %s",</div><div class='del'>-				      uid, service-&gt;url-&gt;host, "Unknown error");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;flags = (info-&gt;flags &amp; ~flags) | (set &amp; flags) | CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name, CamelException *ex)</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_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return;</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 17f6d505d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-folder.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-imap-folder.h : Abstract class for an imap folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author: </div><div class='del'>- *   Jeffrey Stedfast &lt;fejj@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-</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 &lt;gtk/gtk.h&gt;</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_FOLDER_TYPE     (camel_imap_folder_get_type ())</div><div class='del'>-#define CAMEL_IMAP_FOLDER(obj)     (GTK_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))</div><div class='del'>-#define CAMEL_IMAP_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass))</div><div class='del'>-#define IS_CAMEL_IMAP_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE))</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'>-	CamelFolderSearch *search; /* used to run searches */</div><div class='del'>-	GPtrArray *summary;</div><div class='del'>-	gint count;</div><div class='del'>-} CamelImapFolder;</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'>-} 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, char *folder_name,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-void camel_imap_folder_set_namespace (CamelFolder *folder, gchar *namespace);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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-provider.c b/camel/providers/imap/camel-imap-provider.c<br/>deleted file mode 100644<br/>index b9d8c74847..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-provider.c</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-provider.c: imap provider registration code */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Helix Code, Inc. (www.helixcode.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'>-#include "config.h"</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'>-</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'>-static CamelProvider imap_provider = {</div><div class='del'>-	"imap",</div><div class='del'>-	"IMAPv4",</div><div class='del'>-</div><div class='del'>-	"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'>-	0,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-</div><div class='del'>-	NULL</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'>-</div><div class='del'>-	imap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);</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-store.c b/camel/providers/imap/camel-imap-store.c<br/>deleted file mode 100644<br/>index f178ad8390..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-store.c</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'>-/* camel-imap-store.c : class for an imap store */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Helix Code, Inc. (www.helixcode.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'>-#include &lt;config.h&gt;</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'>-</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-folder.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'>-</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 CamelServiceClass *service_class = NULL;</div><div class='del'>-</div><div class='del'>-static void finalize (GtkObject *object);</div><div class='del'>-static gboolean imap_create (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean imap_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean imap_disconnect (CamelService *service, CamelException *ex);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static void free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, gboolean create,</div><div class='del'>-				CamelException *ex);</div><div class='del'>-static char *get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static int camel_imap_status (char *cmdid, char *respbuf);</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'>-	/* virtual method overload */</div><div class='del'>-	GtkObjectClass *object_class =</div><div class='del'>-		GTK_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'>-	</div><div class='del'>-	service_class = gtk_type_class (camel_service_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	object_class-&gt;finalize = finalize;</div><div class='del'>-</div><div class='del'>-	camel_service_class-&gt;connect = imap_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = imap_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	camel_service_class-&gt;free_auth_types = free_auth_types;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_name = get_folder_name;</div><div class='del'>-}</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'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-</div><div class='del'>-	service-&gt;url_flags = (CAMEL_SERVICE_URL_NEED_USER | CAMEL_SERVICE_URL_NEED_HOST);</div><div class='del'>-</div><div class='del'>-	store-&gt;folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_imap_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_imap_store_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_imap_store_type)	{</div><div class='del'>-		GtkTypeInfo camel_imap_store_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelImapStore",</div><div class='del'>-			sizeof (CamelImapStore),</div><div class='del'>-			sizeof (CamelImapStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_imap_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_imap_store_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'>-		camel_imap_store_type = gtk_type_unique (CAMEL_STORE_TYPE, &amp;camel_imap_store_info);</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'>-finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelException ex;</div><div class='del'>-</div><div class='del'>-	camel_exception_init (&amp;ex);</div><div class='del'>-	imap_disconnect (CAMEL_SERVICE (object), &amp;ex);</div><div class='del'>-	camel_exception_clear (&amp;ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	"Password",</div><div class='del'>-</div><div class='del'>-	"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'>-static gboolean</div><div class='del'>-try_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	gint fd;</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'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	sin.sin_port = htons (service-&gt;url-&gt;port ? service-&gt;url-&gt;port : IMAP_PORT);</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'>-	if (fd == -1 || connect (fd, (struct sockaddr *)&amp;sin, sizeof(sin)) == -1) {</div><div class='del'>-</div><div class='del'>-		/* We don't want to set a CamelException here */</div><div class='del'>-</div><div class='del'>-		if (fd &gt; -1)</div><div class='del'>-			close (fd);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close (fd);</div><div class='del'>-	return TRUE;</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'>-	GList *ret = NULL;</div><div class='del'>-	gboolean passwd = TRUE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url) {</div><div class='del'>-		passwd = try_connect (service, ex);</div><div class='del'>-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (passwd)</div><div class='del'>-		ret = g_list_append (ret, &amp;password_authtype);</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not connect to IMAP server on "</div><div class='del'>-				      "%s.", service-&gt;url-&gt;host);</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'>-free_auth_types (CamelService *service, GList *authtypes)</div><div class='del'>-{</div><div class='del'>-	g_list_free (authtypes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	gint fd, status;</div><div class='del'>-	gchar *buf, *msg;</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-</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;authmech &amp;&amp; !service-&gt;url-&gt;passwd) {</div><div class='del'>-		gchar *prompt = g_strdup_printf ("Please enter the IMAP password for %s@%s",</div><div class='del'>-						service-&gt;url-&gt;user, h-&gt;h_name);</div><div class='del'>-		service-&gt;url-&gt;passwd =</div><div class='del'>-			camel_session_query_authenticator (camel_service_get_session (service),</div><div class='del'>-							   CAMEL_AUTHENTICATOR_ASK, prompt,</div><div class='del'>-							   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'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	if (service-&gt;url-&gt;port)</div><div class='del'>-		sin.sin_port = htons(service-&gt;url-&gt;port);</div><div class='del'>-	else</div><div class='del'>-		sin.sin_port = htons(IMAP_PORT);</div><div class='del'>-</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'>-	if (fd == -1 || connect (fd, (struct sockaddr *)&amp;sin, sizeof(sin)) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not connect to %s (port %s): %s",</div><div class='del'>-				      service-&gt;url-&gt;host, service-&gt;url-&gt;port,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		if (fd &gt; -1)</div><div class='del'>-			close (fd);</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'>-	store-&gt;ostream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	store-&gt;istream = camel_stream_buffer_new (store-&gt;ostream,</div><div class='del'>-						  CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-	store-&gt;command = 0;</div><div class='del'>-</div><div class='del'>-	/* Read the greeting, if any. */</div><div class='del'>-	buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store-&gt;istream));</div><div class='del'>-	if (!buf) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not read greeting from IMAP "</div><div class='del'>-				      "server: %s",</div><div class='del'>-				      camel_exception_get_description (ex));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (store-&gt;ostream));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (store-&gt;istream));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	status = camel_imap_command(store, NULL, &amp;msg, "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'>-</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      "Unable to authenticate to IMAP "</div><div class='del'>-				      "server. Error sending password:"</div><div class='del'>-				      " %s", msg ? msg : "(Unknown)");</div><div class='del'>-		g_free (msg);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (store-&gt;ostream));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (store-&gt;istream));</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		g_message ("IMAP Service sucessfully authenticated user %s", service-&gt;url-&gt;user);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	service_class-&gt;connect (service, ex);</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 (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (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'>-	if (!service_class-&gt;disconnect (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (store-&gt;ostream));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (store-&gt;istream));</div><div class='del'>-	store-&gt;ostream = NULL;</div><div class='del'>-	store-&gt;istream = NULL;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_imap_store_get_toplevel_dir (CamelImapStore *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 gboolean</div><div class='del'>-imap_folder_exists (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	gchar *result, *folder_path;</div><div class='del'>-	gint status;</div><div class='del'>-</div><div class='del'>-	if (url &amp;&amp; url-&gt;path &amp;&amp; *(url-&gt;path + 1) &amp;&amp; strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-		folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-	else</div><div class='del'>-		folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), NULL,</div><div class='del'>-					      &amp;result, "EXAMINE %s", folder_path);</div><div class='del'>-</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (folder_path);</div><div class='del'>-	g_free (result);</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_create (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	gchar *result, *folder_path;</div><div class='del'>-	gint status;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (folder != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	if (!(folder-&gt;full_name || folder-&gt;name)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-				     "invalid folder path. Use set_name ?");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (imap_folder_exists (folder))</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-        /* create the directory for the subfolder */</div><div class='del'>-	if (url &amp;&amp; url-&gt;path &amp;&amp; *(url-&gt;path + 1) &amp;&amp; strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-		folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-	else</div><div class='del'>-		folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-	</div><div class='del'>-	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder-&gt;parent_store), NULL,</div><div class='del'>-					      &amp;result, "CREATE %s", folder_path);</div><div class='del'>-</div><div class='del'>-	if (status != CAMEL_IMAP_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not CREATE %s on IMAP server %s: %s.",</div><div class='del'>-				      folder_path, service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_IMAP_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (folder_path);</div><div class='del'>-	g_free (result);</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, gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-	char *folder_path;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (store != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (folder_name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (folder_name, "/"))</div><div class='del'>-		folder_path = g_strdup ("INBOX");</div><div class='del'>-	else</div><div class='del'>-		folder_path = g_strdup (folder_name);</div><div class='del'>-	</div><div class='del'>-	new_folder = camel_imap_folder_new (store, folder_path, ex);</div><div class='del'>-</div><div class='del'>-	if (create &amp;&amp; !imap_create (new_folder, ex)) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup (folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_imap_status (char *cmdid, char *respbuf)</div><div class='del'>-{</div><div class='del'>-	char *retcode;</div><div class='del'>-</div><div class='del'>-	if (respbuf) {</div><div class='del'>-		retcode = strstr (respbuf, cmdid);</div><div class='del'>-		if (retcode) {</div><div class='del'>-			retcode += strlen (cmdid) + 1;</div><div class='del'>-			</div><div class='del'>-			if (!strncmp (retcode, "OK", 2))</div><div class='del'>-				return CAMEL_IMAP_OK;</div><div class='del'>-			else if (!strncmp (retcode, "NO", 2))</div><div class='del'>-				return CAMEL_IMAP_ERR;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return CAMEL_IMAP_FAIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command: Send a command to a IMAP server.</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @ret: a pointer to return the full server response in</div><div class='del'>- * @fmt: a printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This command sends the command specified by @fmt and the following</div><div class='del'>- * arguments to the connected IMAP store specified by @store. It then</div><div class='del'>- * reads the server's response and parses out the status code. If</div><div class='del'>- * the caller passed a non-NULL pointer for @ret, camel_imap_command</div><div class='del'>- * will set it to point to an buffer containing the rest of the</div><div class='del'>- * response from the IMAP server. (If @ret was passed but there was</div><div class='del'>- * no extended response, @ret will be set to NULL.) The caller must</div><div class='del'>- * free this buffer when it is done with it.</div><div class='del'>- *</div><div class='del'>- * Return value: one of CAMEL_IMAP_OK (command executed successfully),</div><div class='del'>- * CAMEL_IMAP_ERR (command encounted an error), or CAMEL_IMAP_FAIL</div><div class='del'>- * (a protocol-level error occurred, and Camel is uncertain of the</div><div class='del'>- * result of the command.)</div><div class='del'>- **/</div><div class='del'>-gint</div><div class='del'>-camel_imap_command (CamelImapStore *store, CamelFolder *folder, char **ret, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	gchar *cmdbuf, *respbuf;</div><div class='del'>-	gchar *cmdid;</div><div class='del'>-	va_list ap;</div><div class='del'>-	gint status = CAMEL_IMAP_OK;</div><div class='del'>-</div><div class='del'>-	if (folder &amp;&amp; store-&gt;current_folder != folder &amp;&amp; strncmp (fmt, "STATUS", 6) &amp;&amp;</div><div class='del'>-	    strncmp (fmt, "CREATE", 5) &amp;&amp; strcmp (fmt, "CAPABILITY")) {</div><div class='del'>-		/* We need to select the correct mailbox first */</div><div class='del'>-		char *r, *folder_path;</div><div class='del'>-		int s;</div><div class='del'>-</div><div class='del'>-		if (url &amp;&amp; url-&gt;path &amp;&amp; strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-			folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-		else</div><div class='del'>-			folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-		</div><div class='del'>-		s = camel_imap_command_extended (store, folder, &amp;r, "SELECT %s", folder_path);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		if (s != CAMEL_IMAP_OK) {</div><div class='del'>-			*ret = r;</div><div class='del'>-			return s;</div><div class='del'>-		} else {</div><div class='del'>-			/* parse the read-write mode */</div><div class='del'>-#if 0</div><div class='del'>-			char *p;</div><div class='del'>-</div><div class='del'>-			p = strstr (result, "\n");</div><div class='del'>-			while (p) {</div><div class='del'>-				if (*(p + 1) == '*')</div><div class='del'>-					p = strstr (p, "\n");</div><div class='del'>-				else</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (p) {</div><div class='del'>-				if (strstrcase (p, "READ-WRITE"))</div><div class='del'>-					mode = </div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		store-&gt;current_folder = folder;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* create the command */</div><div class='del'>-	cmdid = g_strdup_printf ("A%.5d", store-&gt;command++);</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	cmdbuf = g_strdup_vprintf (fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "sending : %s %s\r\n", cmdid, cmdbuf);</div><div class='del'>-	fflush (stderr);</div><div class='del'>-</div><div class='del'>-	if (camel_stream_printf (store-&gt;ostream, "%s %s\r\n", cmdid, cmdbuf) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		g_free (cmdid);</div><div class='del'>-		if (*ret)</div><div class='del'>-			*ret = g_strdup (strerror (errno));</div><div class='del'>-		return CAMEL_IMAP_FAIL;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-</div><div class='del'>-	/* Read the response */</div><div class='del'>-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store-&gt;istream));</div><div class='del'>-	if (respbuf == NULL) {</div><div class='del'>-		if (*ret)</div><div class='del'>-			*ret = g_strdup (strerror (errno));</div><div class='del'>-		return CAMEL_IMAP_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)");</div><div class='del'>-	fflush (stderr);</div><div class='del'>-</div><div class='del'>-	status = camel_imap_status (cmdid, respbuf);</div><div class='del'>-	g_free (cmdid);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (status != CAMEL_IMAP_FAIL) {</div><div class='del'>-			*ret = strchr (respbuf, ' ');</div><div class='del'>-			if (*ret)</div><div class='del'>-				*ret = g_strdup (*ret + 1);</div><div class='del'>-		} else</div><div class='del'>-			*ret = NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free (respbuf);</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'>- * camel_imap_command_extended: Send a command to a IMAP server and get</div><div class='del'>- * a multi-line response.</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @ret: a pointer to return the full server response in</div><div class='del'>- * @fmt: a printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This command sends the command specified by @fmt and the following</div><div class='del'>- * arguments to the connected IMAP store specified by @store. It then</div><div class='del'>- * reads the server's response and parses out the status code.</div><div class='del'>- * Camel_imap_command_extended will set it to point to a buffer containing the</div><div class='del'>- * response from the IMAP server. (If @ret was passed but there was The caller</div><div class='del'>- * must free this buffer when it is done with it.</div><div class='del'>- *</div><div class='del'>- * This command gets the additional data returned by "multi-line" IMAP</div><div class='del'>- * commands, such as SELECT, LIST, LSUB, and various other commands.</div><div class='del'>- * The returned data is un-byte-stuffed, and has lines termined by</div><div class='del'>- * newlines rather than CR/LF pairs.</div><div class='del'>- *</div><div class='del'>- * Return value: one of CAMEL_IMAP_OK (command executed successfully),</div><div class='del'>- * CAMEL_IMAP_ERR (command encounted an error), or CAMEL_IMAP_FAIL</div><div class='del'>- * (a protocol-level error occurred, and Camel is uncertain of the</div><div class='del'>- * result of the command.)</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-camel_imap_command_extended (CamelImapStore *store, CamelFolder *folder, char **ret, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (CAMEL_STORE (store))-&gt;url;</div><div class='del'>-	CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store-&gt;istream);</div><div class='del'>-	GPtrArray *data;</div><div class='del'>-	gchar *cmdid, *cmdbuf, *respbuf;</div><div class='del'>-	va_list app;</div><div class='del'>-	gint status = CAMEL_IMAP_OK;</div><div class='del'>-</div><div class='del'>-	if (folder &amp;&amp; store-&gt;current_folder != folder &amp;&amp; strncmp (fmt, "SELECT", 6) &amp;&amp;</div><div class='del'>-	    strncmp (fmt, "STATUS", 6) &amp;&amp; strncmp (fmt, "CREATE", 5) &amp;&amp; strcmp (fmt, "CAPABILITY")) {</div><div class='del'>-		/* We need to select the correct mailbox first */</div><div class='del'>-		char *r, *folder_path;</div><div class='del'>-		int s;</div><div class='del'>-</div><div class='del'>-		if (url &amp;&amp; url-&gt;path &amp;&amp; strcmp (folder-&gt;full_name, "INBOX"))</div><div class='del'>-			folder_path = g_strdup_printf ("%s/%s", url-&gt;path + 1, folder-&gt;full_name);</div><div class='del'>-		else</div><div class='del'>-			folder_path = g_strdup (folder-&gt;full_name);</div><div class='del'>-		</div><div class='del'>-		s = camel_imap_command_extended (store, folder, &amp;r, "SELECT %s", folder_path);</div><div class='del'>-		g_free (folder_path);</div><div class='del'>-		if (s != CAMEL_IMAP_OK) {</div><div class='del'>-			*ret = r;</div><div class='del'>-			return s;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		store-&gt;current_folder = folder;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Create the command */</div><div class='del'>-	cmdid = g_strdup_printf ("A%.5d", store-&gt;command++);</div><div class='del'>-	va_start (app, fmt);</div><div class='del'>-	cmdbuf = g_strdup_vprintf (fmt, app);</div><div class='del'>-	va_end (app);</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "sending : %s %s\r\n", cmdid, cmdbuf);</div><div class='del'>-</div><div class='del'>-	if (camel_stream_printf (store-&gt;ostream, "%s %s\r\n", cmdid, cmdbuf) == -1) {</div><div class='del'>-		g_free(cmdbuf);</div><div class='del'>-		g_free(cmdid);</div><div class='del'>-</div><div class='del'>-		*ret = g_strdup (strerror(errno));</div><div class='del'>-</div><div class='del'>-		return CAMEL_IMAP_FAIL;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-</div><div class='del'>-	data = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (stream);</div><div class='del'>-		if (!respbuf || !strncmp(respbuf, cmdid, strlen(cmdid)) ) {	</div><div class='del'>-			/* IMAP's last response starts with our command id */</div><div class='del'>-			fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fprintf (stderr, "received: %s\n", respbuf);</div><div class='del'>-</div><div class='del'>-		g_ptr_array_add (data, respbuf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (respbuf) {</div><div class='del'>-		g_ptr_array_add (data, respbuf);</div><div class='del'>-		status = camel_imap_status (cmdid, respbuf);</div><div class='del'>-	} else {</div><div class='del'>-		status = CAMEL_IMAP_FAIL;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdid);</div><div class='del'>-</div><div class='del'>-	if (status == CAMEL_IMAP_OK) {</div><div class='del'>-		/* Append an empty string to the end of the array</div><div class='del'>-		 * so when we g_strjoinv it, we get a "\n" after</div><div class='del'>-		 * the last real line.</div><div class='del'>-		 */</div><div class='del'>-		g_ptr_array_add (data, "");</div><div class='del'>-		g_ptr_array_add (data, NULL);</div><div class='del'>-		*ret = g_strjoinv ("\n", (gchar **)data-&gt;pdata);</div><div class='del'>-	} else {</div><div class='del'>-		if (status != CAMEL_IMAP_FAIL &amp;&amp; respbuf)</div><div class='del'>-		        *ret = g_strdup (strchr (respbuf, ' ' + 1));</div><div class='del'>-		else</div><div class='del'>-			*ret = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (data, TRUE);</div><div class='del'>-	</div><div class='del'>-	return status;</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 c8fa92eb89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-store.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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 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'>-</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 &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-store.h"</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)     (GTK_CHECK_CAST((obj), CAMEL_IMAP_STORE_TYPE, CamelImapStore))</div><div class='del'>-#define CAMEL_IMAP_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STORE_TYPE, CamelImapStoreClass))</div><div class='del'>-#define IS_CAMEL_IMAP_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_IMAP_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'>-	CamelFolder *current_folder;</div><div class='del'>-	CamelStream *istream, *ostream;</div><div class='del'>-	</div><div class='del'>-	guint32 command;</div><div class='del'>-</div><div class='del'>-} CamelImapStore;</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'>-} CamelImapStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void camel_imap_store_open (CamelImapStore *store, CamelException *ex);</div><div class='del'>-void camel_imap_store_close (CamelImapStore *store, gboolean expunge, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* support functions */</div><div class='del'>-</div><div class='del'>-enum { CAMEL_IMAP_OK, CAMEL_IMAP_ERR, CAMEL_IMAP_FAIL };</div><div class='del'>-</div><div class='del'>-gint camel_imap_command (CamelImapStore *store, CamelFolder *folder, char **ret, char *fmt, ...);</div><div class='del'>-gint camel_imap_command_extended (CamelImapStore *store, CamelFolder *folder, char **ret, char *fmt, ...);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_imap_store_get_type (void);</div><div class='del'>-</div><div class='del'>-const gchar *camel_imap_store_get_toplevel_dir (CamelImapStore *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_IMAP_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-stream.c b/camel/providers/imap/camel-imap-stream.c<br/>deleted file mode 100644<br/>index 43b1afb61a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-stream.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,192 +0,0 @@</div><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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Helix Code, Inc. (www.helixcode.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'>-#include &lt;config.h&gt;</div><div class='del'>-#include "camel-imap-stream.h"</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</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 CamelImapStream */</div><div class='del'>-#define CIS_CLASS(so) CAMEL_IMAP_STREAM_CLASS (GTK_OBJECT(so)-&gt;klass)</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 int stream_reset (CamelStream *stream);</div><div class='del'>-static gboolean stream_eos (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static void finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_stream_class_init (CamelImapStreamClass *camel_imap_stream_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_imap_stream_class);</div><div class='del'>-	GtkObjectClass *gtk_object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_imap_stream_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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;reset = stream_reset;</div><div class='del'>-	camel_stream_class-&gt;eos   = stream_eos;</div><div class='del'>-</div><div class='del'>-	gtk_object_class-&gt;finalize = finalize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_stream_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (object);</div><div class='del'>-</div><div class='del'>-	imap_stream-&gt;cache = NULL;</div><div class='del'>-	imap_stream-&gt;cache_ptr = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_imap_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_imap_stream_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_imap_stream_type) {</div><div class='del'>-		GtkTypeInfo camel_imap_stream_info =</div><div class='del'>-		{</div><div class='del'>-			"CamelImapStream",</div><div class='del'>-			sizeof (CamelImapStream),</div><div class='del'>-			sizeof (CamelImapStreamClass),</div><div class='del'>-			(GtkClassInitFunc) camel_imap_stream_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_imap_stream_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'>-		camel_imap_stream_type = gtk_type_unique (camel_stream_get_type (), &amp;camel_imap_stream_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_imap_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_imap_stream_new (CamelImapFolder *folder, char *command)</div><div class='del'>-{</div><div class='del'>-	CamelImapStream *imap_stream;</div><div class='del'>-</div><div class='del'>-	imap_stream = gtk_type_new (camel_imap_stream_get_type ());</div><div class='del'>-</div><div class='del'>-	imap_stream-&gt;folder  = folder;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT (imap_stream-&gt;folder));</div><div class='del'>-	</div><div class='del'>-	imap_stream-&gt;command = g_strdup(command);</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (imap_stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (object);</div><div class='del'>-</div><div class='del'>-	g_free(imap_stream-&gt;cache);</div><div class='del'>-	g_free(imap_stream-&gt;command);</div><div class='del'>-</div><div class='del'>-	if (imap_stream-&gt;folder)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT (imap_stream-&gt;folder));</div><div class='del'>-</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 ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	</div><div class='del'>-	/* do we want to do any IMAP specific parsing in here? If not, maybe rename to camel-stream-cache? */</div><div class='del'>-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (stream);</div><div class='del'>-</div><div class='del'>-	if (!imap_stream-&gt;cache) {</div><div class='del'>-		/* We need to send the IMAP command since this is our first fetch */</div><div class='del'>-		CamelFolder *folder = CAMEL_FOLDER (imap_stream-&gt;folder);</div><div class='del'>-		gint status;</div><div class='del'>-		</div><div class='del'>-		status = camel_imap_command_extended(CAMEL_IMAP_STORE (folder-&gt;parent_store),</div><div class='del'>-						     CAMEL_FOLDER (imap_stream-&gt;folder),</div><div class='del'>-						     &amp;imap_stream-&gt;cache, "%s",</div><div class='del'>-						     imap_stream-&gt;command);</div><div class='del'>-</div><div class='del'>-		if (status != CAMEL_IMAP_OK) {</div><div class='del'>-			/* we got an error, dump this stuff */</div><div class='del'>-			g_free(imap_stream-&gt;cache);</div><div class='del'>-			imap_stream-&gt;cache = NULL;</div><div class='del'>-			</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* we don't need the folder anymore... */</div><div class='del'>-		gtk_object_unref(GTK_OBJECT (imap_stream-&gt;folder));</div><div class='del'>-</div><div class='del'>-		imap_stream-&gt;cache_ptr = imap_stream-&gt;cache;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* we've already read this stream, so return whats in the cache */</div><div class='del'>-	nread = MIN (n, strlen(imap_stream-&gt;cache_ptr));</div><div class='del'>-	</div><div class='del'>-	if (nread &gt; 0) {</div><div class='del'>-		memcpy(buffer, imap_stream-&gt;cache_ptr, nread);</div><div class='del'>-		imap_stream-&gt;cache_ptr += nread;</div><div class='del'>-	} else {</div><div class='del'>-		nread = -1;</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 int</div><div class='del'>-stream_reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (stream);</div><div class='del'>-	</div><div class='del'>-	imap_stream-&gt;cache_ptr = imap_stream-&gt;cache;</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'>-stream_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelImapStream *imap_stream = CAMEL_IMAP_STREAM (stream);</div><div class='del'>-</div><div class='del'>-	return (imap_stream-&gt;cache_ptr &amp;&amp; strlen(imap_stream-&gt;cache_ptr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='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/providers/imap/camel-imap-stream.h b/camel/providers/imap/camel-imap-stream.h<br/>deleted file mode 100644<br/>index 2a6e2fc723..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-stream.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/imap/camel-imap-stream.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'>- *  Authors: Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Helix Code, Inc. (www.helixcode.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_IMAP_STREAM_H</div><div class='del'>-#define CAMEL_IMAP_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;camel/camel-stream.h&gt;</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_STREAM_TYPE     (camel_imap_stream_get_type ())</div><div class='del'>-#define CAMEL_IMAP_STREAM(obj)     (GTK_CHECK_CAST((obj), CAMEL_IMAP_STREAM_TYPE, CamelImapStream))</div><div class='del'>-#define CAMEL_IMAP_STREAM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STREAM_TYPE, CamelImapStreamClass))</div><div class='del'>-#define CAMEL_IS_IMAP_STREAM(o)    (GTK_CHECK_TYPE((o), CAMEL_IMAP_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapStream CamelImapStream;</div><div class='del'>-typedef struct _CamelImapStreamClass CamelImapStreamClass;</div><div class='del'>-</div><div class='del'>-struct _CamelImapStream {</div><div class='del'>-	CamelStream parent_object;</div><div class='del'>-</div><div class='del'>-	CamelImapFolder *folder;</div><div class='del'>-	char *command;</div><div class='del'>-	char *cache;</div><div class='del'>-	char *cache_ptr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelImapStreamClass {</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 Gtk function */</div><div class='del'>-GtkType camel_imap_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_imap_stream_new (CamelImapFolder *folder, char *command);</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_STREAM_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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/maildir/.cvsignore b/camel/providers/maildir/.cvsignore<br/>deleted file mode 100644<br/>index 2e7b174532..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/.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'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-.libs</div><div class='head'>diff --git a/camel/providers/maildir/Makefile.am b/camel/providers/maildir/Makefile.am<br/>deleted file mode 100644<br/>index 4dd4f999b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelmaildirincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcamelmaildir.la</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir)/intl -I$(top_srcdir)/camel \</div><div class='del'>-	$(GTK_INCLUDEDIR) -I$(includedir)		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-maildir-provider\"		</div><div class='del'>-</div><div class='del'>-libcamelmaildir_la_SOURCES = \</div><div class='del'>-	camel-maildir-folder.c \</div><div class='del'>-	camel-maildir-provider.c \</div><div class='del'>-	camel-maildir-store.c</div><div class='del'>-</div><div class='del'>-libcamelmaildirinclude_HEADERS = \</div><div class='del'>-	camel-maildir-folder.h \</div><div class='del'>-	camel-maildir-store.h</div><div class='del'>-</div><div class='del'>-libcamelmaildir_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = </div><div class='head'>diff --git a/camel/providers/maildir/camel-maildir-folder.c b/camel/providers/maildir/camel-maildir-folder.c<br/>deleted file mode 100644<br/>index 2cb81f3e81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/camel-maildir-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/camel-maildir-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,802 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-maildir-folder.c : camel-folder subclass for maildir folders */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@inria.fr&gt; .</div><div class='del'>- *</div><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'>-/*</div><div class='del'>- * AUTHORS : Jukka Zitting </div><div class='del'>- *  </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;sys/stat.h&gt; </div><div class='del'>-#include &lt;sys/param.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;fcntl.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-maildir-folder.h"</div><div class='del'>-#include "camel-maildir-store.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-log.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 CamelMaildirFolder */</div><div class='del'>-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMAILDIRS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static void _init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex);</div><div class='del'>-static void _set_name (CamelFolder *folder, const gchar *name, CamelException *ex);</div><div class='del'>-static gboolean _exists (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean _create (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);</div><div class='del'>-static gboolean _delete_messages (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *_get_message (CamelFolder *folder, gint number, CamelException *ex);</div><div class='del'>-static gint _get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void _expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GList *_list_subfolders (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* fs utility functions */</div><div class='del'>-static DIR * _xopendir (const gchar *path);</div><div class='del'>-static gboolean _xstat (const gchar *path, struct stat *buf);</div><div class='del'>-static gboolean _xmkdir (const gchar *path);</div><div class='del'>-static gboolean _xrename (const gchar *from, const gchar *to);</div><div class='del'>-static gboolean _xunlink (const gchar *path);</div><div class='del'>-static gboolean _xrmdir (const gchar *path);</div><div class='del'>-/* ** */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_maildir_folder_class_init (CamelMaildirFolderClass *camel_maildir_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class =</div><div class='del'>-		CAMEL_FOLDER_CLASS (camel_maildir_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_folder_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;init_with_store   = _init_with_store;</div><div class='del'>-	camel_folder_class-&gt;set_name          = _set_name;</div><div class='del'>-	camel_folder_class-&gt;exists            = _exists;</div><div class='del'>-	camel_folder_class-&gt;create            = _create;</div><div class='del'>-	camel_folder_class-&gt;delete            = _delete;</div><div class='del'>-	camel_folder_class-&gt;delete_messages   = _delete_messages;</div><div class='del'>-	camel_folder_class-&gt;expunge           = _expunge;</div><div class='del'>-	camel_folder_class-&gt;get_message       = _get_message;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = _get_message_count;</div><div class='del'>-	camel_folder_class-&gt;list_subfolders   = _list_subfolders;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_maildir_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_maildir_folder_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_maildir_folder_type)	{</div><div class='del'>-		GtkTypeInfo camel_maildir_folder_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMaildirFolder",</div><div class='del'>-			sizeof (CamelMaildirFolder),</div><div class='del'>-			sizeof (CamelMaildirFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_maildir_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_maildir_folder_type =</div><div class='del'>-			gtk_type_unique (CAMEL_FOLDER_TYPE, &amp;camel_maildir_folder_info);</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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::init_with_store: initializes the folder object</div><div class='del'>- * @folder:       folder object to initialize</div><div class='del'>- * @parent_store: parent store object of the folder</div><div class='del'>- *</div><div class='del'>- * Simply tells that the folder can contain messages but not subfolders.</div><div class='del'>- * Perhaps we'll later implement subfolders too...</div><div class='del'>- */</div><div class='del'>-static void </div><div class='del'>-_init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::init_with_store\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	g_assert (parent_store);</div><div class='del'>-	</div><div class='del'>-	/* call parent method */</div><div class='del'>-	parent_class-&gt;init_with_store (folder, parent_store, ex);</div><div class='del'>-	</div><div class='del'>-	folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = TRUE;</div><div class='del'>-	folder-&gt;has_summary_capability = FALSE;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::init_with_store\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::set_name: sets the name of the folder</div><div class='del'>- * @folder: folder object</div><div class='del'>- * @name:   name of the folder</div><div class='del'>- *</div><div class='del'>- * Sets the name of the folder object. The existence of a folder with</div><div class='del'>- * the given name is not checked in this function.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-_set_name (CamelFolder *folder, const gchar *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder;</div><div class='del'>-	CamelMaildirStore *maildir_store;</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::set_name\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	g_assert (name);</div><div class='del'>-	g_assert (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	maildir_folder = CAMEL_MAILDIR_FOLDER (folder);</div><div class='del'>-	maildir_store = CAMEL_MAILDIR_STORE (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;set_name (folder, name, ex);</div><div class='del'>-	</div><div class='del'>-	if (maildir_folder-&gt;directory_path)</div><div class='del'>-		g_free (maildir_folder-&gt;directory_path);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name full_name is %s\n", folder-&gt;full_name);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name toplevel_dir is %s\n", maildir_store-&gt;toplevel_dir);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name separator is %c\n", camel_store_get_separator (folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;full_name &amp;&amp; folder-&gt;full_name[0])</div><div class='del'>-		maildir_folder-&gt;directory_path =</div><div class='del'>-			g_strconcat (maildir_store-&gt;toplevel_dir, G_DIR_SEPARATOR_S,</div><div class='del'>-				     folder-&gt;full_name, NULL);</div><div class='del'>-	else</div><div class='del'>-		maildir_folder-&gt;directory_path = g_strdup (maildir_store-&gt;toplevel_dir);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::set_name: name set to %s\n", name);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::set_name\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::exists: tests whether the named maildir exists</div><div class='del'>- * @folder: folder object</div><div class='del'>- *</div><div class='del'>- * A created maildir folder object doesn't necessarily exist yet in the</div><div class='del'>- * filesystem. This function checks whether the maildir exists.</div><div class='del'>- * The structure of the maildir is stated in the maildir.5 manpage.</div><div class='del'>- *</div><div class='del'>- * maildir.5:</div><div class='del'>- *     A directory in maildir format  has  three  subdirectories,</div><div class='del'>- *     all on the same filesystem: tmp, new, and cur.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the maildir exists, FALSE otherwise</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-_exists (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);</div><div class='del'>-	static const gchar *dir[3] = { "new", "cur", "tmp" };</div><div class='del'>-	gint i;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *path;</div><div class='del'>-	gboolean rv = TRUE;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::exists\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	g_return_val_if_fail (maildir_folder-&gt;directory_path, FALSE);</div><div class='del'>-</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMailFolder::exists: checking maildir %s\n",</div><div class='del'>-			      maildir);</div><div class='del'>-</div><div class='del'>-	/* check whether the toplevel directory exists */</div><div class='del'>-	rv = _xstat (maildir, &amp;statbuf) &amp;&amp; S_ISDIR (statbuf.st_mode);</div><div class='del'>-</div><div class='del'>-	/* check whether the maildir subdirectories exist */</div><div class='del'>-	for (i = 0; rv &amp;&amp; i &lt; 3; i++) {</div><div class='del'>-		path = g_strconcat (maildir, G_DIR_SEPARATOR_S, dir[i], NULL);</div><div class='del'>-</div><div class='del'>-		rv = _xstat (path, &amp;statbuf) &amp;&amp; S_ISDIR (statbuf.st_mode);</div><div class='del'>-</div><div class='del'>-		g_free (path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::exists: %s\n",</div><div class='del'>-			      (rv) ? "maildir found" : "maildir not found");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::exists\n");</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::create: creates the named maildir</div><div class='del'>- * @folder: folder object</div><div class='del'>- *</div><div class='del'>- * A created maildir folder object doesn't necessarily exist yet in the</div><div class='del'>- * filesystem. This function creates the maildir if it doesn't yet exist.</div><div class='del'>- * The structure of the maildir is stated in the maildir.5 manpage.</div><div class='del'>- *</div><div class='del'>- * maildir.5:</div><div class='del'>- *     A directory in maildir format  has  three  subdirectories,</div><div class='del'>- *     all on the same filesystem: tmp, new, and cur.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the maildir existed already or was created,</div><div class='del'>- *               FALSE otherwise</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-_create (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);</div><div class='del'>-	static const gchar *dir[3] = { "new", "cur", "tmp" };</div><div class='del'>-	gint i;</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *path;</div><div class='del'>-	gboolean rv = TRUE;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::create\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-</div><div class='del'>-	/* check whether the maildir already exists */</div><div class='del'>-	if (camel_folder_exists (folder, ex)) return TRUE;</div><div class='del'>-</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMailFolder::create: creating maildir %s\n",</div><div class='del'>-			      maildir);</div><div class='del'>-</div><div class='del'>-	/* create the toplevel directory */</div><div class='del'>-	rv = _xmkdir (maildir);</div><div class='del'>-</div><div class='del'>-	/* create the maildir subdirectories */</div><div class='del'>-	for (i = 0; rv &amp;&amp; i &lt; 3; i++) {</div><div class='del'>-		path = g_strconcat (maildir, G_DIR_SEPARATOR_S, dir[i], NULL);</div><div class='del'>-</div><div class='del'>-		rv = _xmkdir (path);</div><div class='del'>-</div><div class='del'>-		g_free (path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::create: %s\n",</div><div class='del'>-			      rv ? "maildir created" : "an error occurred");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::create\n");</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::delete: delete the maildir folder</div><div class='del'>- * @folder: the folder object</div><div class='del'>- * @recurse:</div><div class='del'>- *</div><div class='del'>- * This function empties and deletes the maildir folder. The subdirectories</div><div class='del'>- * "tmp", "cur", and "new" are removed first and then the toplevel maildir</div><div class='del'>- * directory is deleted. All files from the directories are deleted as well, </div><div class='del'>- * so you should be careful when using this function. If a subdirectory cannot</div><div class='del'>- * be deleted, then the operation it is stopped. Thus if an error occurs, the</div><div class='del'>- * maildir directory won't be removed, but it might no longer be a valid maildir.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);</div><div class='del'>-	static const gchar *dir[3] = { "new", "cur", "tmp" };</div><div class='del'>-	gint i;</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *path;</div><div class='del'>-	gboolean rv = TRUE;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::create\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-</div><div class='del'>-	/* check whether the maildir already exists */</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return TRUE;</div><div class='del'>-</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMailFolder::delete: deleting maildir %s\n",</div><div class='del'>-			      maildir);</div><div class='del'>-</div><div class='del'>-	/* delete the maildir subdirectories */</div><div class='del'>-	for (i = 0; rv &amp;&amp; i &lt; 3; i++) {</div><div class='del'>-		path = g_strconcat (maildir, G_DIR_SEPARATOR_S, dir[i], NULL);</div><div class='del'>-</div><div class='del'>-		rv = _xrmdir (path);</div><div class='del'>-</div><div class='del'>-		g_free (path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create the toplevel directory */</div><div class='del'>-	if (rv)</div><div class='del'>-		rv = _xrmdir (maildir);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::delete: %s\n",</div><div class='del'>-			      rv ? "maildir deleted" : "an error occurred");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::delete\n");</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::delete_messages: empty the maildir folder</div><div class='del'>- * @folder:  the folder object</div><div class='del'>- *</div><div class='del'>- * This function empties the maildir folder. All messages from the</div><div class='del'>- * "cur" subdirectory are deleted. If a message cannot be deleted, then</div><div class='del'>- * it is just skipped and the rest of the messages are still deleted.</div><div class='del'>- * Files with names starting with a dot are skipped as described in the</div><div class='del'>- * maildir.5 manpage.</div><div class='del'>- *</div><div class='del'>- * maildir.5:</div><div class='del'>- *     It is a good idea for readers to skip all filenames in new</div><div class='del'>- *     and cur starting with a dot. Other than this, readers</div><div class='del'>- *     should not attempt to parse filenames.</div><div class='del'>- *</div><div class='del'>- * Return value: FALSE on error and if some messages could not be deleted.</div><div class='del'>- *               TRUE otherwise.</div><div class='del'>- */</div><div class='del'>-static gboolean </div><div class='del'>-_delete_messages (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *curdir, *file;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	gboolean rv = TRUE;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::delete_messages\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-</div><div class='del'>-	/* call default implementation */</div><div class='del'>-	parent_class-&gt;delete_messages (folder, ex);</div><div class='del'>-</div><div class='del'>-	/* Check if the folder didn't exist */</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return TRUE;</div><div class='del'>-</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::delete_messages: "</div><div class='del'>-			      "deleting messages from %s\n", maildir);</div><div class='del'>-</div><div class='del'>-	/* delete messages from the maildir subdirectory "cur" */</div><div class='del'>-	curdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "cur", NULL);</div><div class='del'>-</div><div class='del'>-	dir_handle = _xopendir (curdir);</div><div class='del'>-	if (dir_handle) {</div><div class='del'>-		while ((dir_entry = readdir (dir_handle))) {</div><div class='del'>-			if (dir_entry-&gt;d_name[0] == '.') continue;</div><div class='del'>-			file = g_strconcat (curdir, G_DIR_SEPARATOR_S,</div><div class='del'>-					    dir_entry-&gt;d_name, NULL);</div><div class='del'>-</div><div class='del'>-			if (!_xunlink (file)) rv = FALSE;</div><div class='del'>-</div><div class='del'>-			g_free (file);</div><div class='del'>-		}</div><div class='del'>-		closedir (dir_handle);</div><div class='del'>-	} else</div><div class='del'>-		rv = FALSE;</div><div class='del'>-</div><div class='del'>-	g_free (curdir);</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::delete_messages: %s\n",</div><div class='del'>-			      rv ? "messages deleted" : "an error occurred");</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::delete_messages\n");</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::get_message: get a message from maildir</div><div class='del'>- * @folder: the folder object</div><div class='del'>- * @number: number of the message within the folder</div><div class='del'>- *</div><div class='del'>- * Return value: the message, NULL on error</div><div class='del'>- */</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-_get_message (CamelFolder *folder, gint number, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(folder);</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *curdir, *file = NULL;</div><div class='del'>-	gint count = -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::get_message\n");</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* Check if the folder exists */</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return NULL;</div><div class='del'>-</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message: "</div><div class='del'>-			      "getting message #%d from %s\n", number, maildir);</div><div class='del'>-</div><div class='del'>-	/* Count until the desired message is reached */</div><div class='del'>-	curdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "cur", NULL);</div><div class='del'>-	if ((dir_handle = _xopendir (curdir))) {</div><div class='del'>-		while ((count &lt; number) &amp;&amp; (dir_entry = readdir (dir_handle)))</div><div class='del'>-			if (dir_entry-&gt;d_name[0] != '.') count++;</div><div class='del'>-</div><div class='del'>-		if (count == number)</div><div class='del'>-			file = g_strconcat (curdir, G_DIR_SEPARATOR_S,</div><div class='del'>-					    dir_entry-&gt;d_name, NULL);</div><div class='del'>-</div><div class='del'>-		closedir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-	g_free (curdir);</div><div class='del'>-	if (!file) return NULL;</div><div class='del'>-</div><div class='del'>-	/* Create the message object */</div><div class='del'>-	message = camel_mime_message_new ();</div><div class='del'>-	stream = camel_stream_fs_new_with_name (file, CAMEL_STREAM_FS_READ);</div><div class='del'>-</div><div class='del'>-	if (!message || !stream) {</div><div class='del'>-		g_free (file);</div><div class='del'>-		if (stream) gtk_object_unref (GTK_OBJECT (stream));</div><div class='del'>-		if (message) gtk_object_unref (GTK_OBJECT (message));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (message),</div><div class='del'>-						  stream);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (stream));</div><div class='del'>-	gtk_object_set_data_full (GTK_OBJECT (message),</div><div class='del'>-				  "fullpath", file, g_free);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message: "</div><div class='del'>-			      "message %p created from %s\n", message, file);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::get_message\n");</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::get_message_count: count messages in maildir</div><div class='del'>- * @folder:  the folder object</div><div class='del'>- *</div><div class='del'>- * Returns the number of messages in the maildir folder. New messages</div><div class='del'>- * are included in this count. </div><div class='del'>- *</div><div class='del'>- * Return value: number of messages in the maildir, -1 on error</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(folder);</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *newdir, *curdir, *newfile, *curfile;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	guint count = 0;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering "</div><div class='del'>-			      "CamelMaildirFolder::get_message_count\n");</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* check if the maildir exists */</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return -1;</div><div class='del'>-</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-</div><div class='del'>-	newdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "new", NULL);</div><div class='del'>-	curdir = g_strconcat (maildir, G_DIR_SEPARATOR_S, "cur", NULL);</div><div class='del'>-</div><div class='del'>-	/* Check new messages */</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message_count: "</div><div class='del'>-			      "getting new messages from %s\n", newdir);</div><div class='del'>-	if ((dir_handle = _xopendir (newdir))) {</div><div class='del'>-		while ((dir_entry = readdir (dir_handle))) {</div><div class='del'>-			if (dir_entry-&gt;d_name[0] == '.') continue;</div><div class='del'>-			newfile = g_strconcat (newdir, G_DIR_SEPARATOR_S,</div><div class='del'>-					       dir_entry-&gt;d_name, NULL);</div><div class='del'>-			curfile = g_strconcat (curdir, G_DIR_SEPARATOR_S,</div><div class='del'>-					       dir_entry-&gt;d_name, ":2,", NULL);</div><div class='del'>-			</div><div class='del'>-			_xrename (newfile, curfile);</div><div class='del'>-			</div><div class='del'>-			g_free (curfile);</div><div class='del'>-			g_free (newfile);</div><div class='del'>-		}</div><div class='del'>-		closedir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Count messages */</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message_count: "</div><div class='del'>-			      "counting messages in %s\n", curdir);</div><div class='del'>-	if ((dir_handle = _xopendir (curdir))) {</div><div class='del'>-		while ((dir_entry = readdir (dir_handle)))</div><div class='del'>-			if (dir_entry-&gt;d_name[0] != '.') count++;</div><div class='del'>-		closedir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (curdir);</div><div class='del'>-	g_free (newdir);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::get_message_count: "</div><div class='del'>-			      " found %d messages\n", count);</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving "</div><div class='del'>-			      "CamelMaildirFolder::get_message_count\n");</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::expunge: expunge messages marked as deleted</div><div class='del'>- * @folder:  the folder object</div><div class='del'>- *</div><div class='del'>- * Physically deletes the messages marked as deleted in the folder.</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'>-	CamelMimeMessage *message;</div><div class='del'>-	GList *node;</div><div class='del'>-	gchar *fullpath;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::expunge\n");</div><div class='del'>-	g_assert(folder);</div><div class='del'>-</div><div class='del'>-	/* expunge messages marked for deletion */</div><div class='del'>-	for (node = folder-&gt;message_list; node; node = g_list_next(node)) {</div><div class='del'>-		message = CAMEL_MIME_MESSAGE (node-&gt;data);</div><div class='del'>-		if (!message) {</div><div class='del'>-			CAMEL_LOG_WARNING ("CamelMaildirFolder::expunge: "</div><div class='del'>-					   "null message in node %p\n", node);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-				</div><div class='del'>-		if (camel_mime_message_get_flag (message, "DELETED")) {</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::expunge: "</div><div class='del'>-					      "expunging message #%d\n",</div><div class='del'>-					      message-&gt;message_number);</div><div class='del'>-</div><div class='del'>-			/* expunge the message */</div><div class='del'>-			fullpath = gtk_object_get_data (GTK_OBJECT (message),</div><div class='del'>-							"fullpath");</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::expunge: "</div><div class='del'>-					      "message fullpath is %s\n",</div><div class='del'>-					      fullpath);</div><div class='del'>-</div><div class='del'>-			if (_xunlink (fullpath))</div><div class='del'>-				message-&gt;expunged = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			CAMEL_LOG_FULL_DEBUG ("CamelMaildirFolder::expunge: "</div><div class='del'>-					      "skipping message #%d\n",</div><div class='del'>-					      message-&gt;message_number);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::expunge\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * CamelMaildirFolder::list_subfolders: return a list of subfolders</div><div class='del'>- * @folder:  the folder object</div><div class='del'>- *</div><div class='del'>- * Returns the names of the maildir subfolders in a list.</div><div class='del'>- *</div><div class='del'>- * Return value: list of subfolder names</div><div class='del'>- */</div><div class='del'>-static GList *</div><div class='del'>-_list_subfolders (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);</div><div class='del'>-	const gchar *maildir;</div><div class='del'>-	gchar *subdir;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	GList *subfolders = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::list_subfolders\n");</div><div class='del'>-	g_assert (folder);</div><div class='del'>-</div><div class='del'>-	/* check if the maildir exists */</div><div class='del'>-	if (!camel_folder_exists (folder, ex)) return NULL;</div><div class='del'>-</div><div class='del'>-	/* scan through the maildir toplevel directory */</div><div class='del'>-	maildir = maildir_folder-&gt;directory_path;</div><div class='del'>-	if ((dir_handle = _xopendir (maildir))) {</div><div class='del'>-		while ((dir_entry = readdir (dir_handle))) {</div><div class='del'>-			if (dir_entry-&gt;d_name[0] == '.') continue;</div><div class='del'>-			if (strcmp (dir_entry-&gt;d_name, "new") == 0) continue;</div><div class='del'>-			if (strcmp (dir_entry-&gt;d_name, "cur") == 0) continue;</div><div class='del'>-			if (strcmp (dir_entry-&gt;d_name, "tmp") == 0) continue;</div><div class='del'>-</div><div class='del'>-			subdir = g_strconcat (maildir, G_DIR_SEPARATOR_S,</div><div class='del'>-					      dir_entry-&gt;d_name, NULL);</div><div class='del'>-			</div><div class='del'>-			if (_xstat (subdir, &amp;statbuf)</div><div class='del'>-			    &amp;&amp; S_ISDIR (statbuf.st_mode))</div><div class='del'>-				subfolders =</div><div class='del'>-					g_list_append (</div><div class='del'>-						subfolders,</div><div class='del'>-						g_strdup (dir_entry-&gt;d_name));</div><div class='del'>-			</div><div class='del'>-			g_free (subdir);</div><div class='del'>-		}</div><div class='del'>-		closedir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMaildirFolder::list_subfolders\n");</div><div class='del'>-	return subfolders;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * fs utility function </div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static DIR *</div><div class='del'>-_xopendir (const gchar *path)</div><div class='del'>-{</div><div class='del'>-	DIR *handle;</div><div class='del'>-	g_assert (path);</div><div class='del'>-</div><div class='del'>-	handle = opendir (path);</div><div class='del'>-	if (!handle) {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: opendir (%s);\n", path);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return handle;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_xstat (const gchar *path, struct stat *buf)</div><div class='del'>-{</div><div class='del'>-	gint stat_error;</div><div class='del'>-	g_assert (path);</div><div class='del'>-	g_assert (buf);</div><div class='del'>-</div><div class='del'>-	stat_error = stat (path, buf);</div><div class='del'>-	if (stat_error == 0) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (errno == ENOENT) {</div><div class='del'>-		buf-&gt;st_mode = 0;</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: stat (%s, %p);\n", path, buf);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</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'>-_xmkdir (const gchar *path)</div><div class='del'>-{</div><div class='del'>-	g_assert (path);</div><div class='del'>-</div><div class='del'>-	if (mkdir (path, S_IRWXU) == -1) {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: mkdir (%s, S_IRWXU);\n", path);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</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'>-_xrename (const gchar *from, const gchar *to)</div><div class='del'>-{</div><div class='del'>-	g_assert (from);</div><div class='del'>-	g_assert (to);</div><div class='del'>-</div><div class='del'>-	if (rename (from, to) == 0) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: rename (%s, %s);\n", from, to);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</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'>-_xunlink (const gchar *path)</div><div class='del'>-{</div><div class='del'>-	g_assert (path);</div><div class='del'>-</div><div class='del'>-	if (unlink (path) == 0) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (errno == ENOENT) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: unlink (%s);\n", path);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</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'>-_xrmdir (const gchar *path)</div><div class='del'>-{</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	gchar *file;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-	g_assert (path);</div><div class='del'>-</div><div class='del'>-	dir_handle = opendir (path);</div><div class='del'>-	if (!dir_handle &amp;&amp; errno == ENOENT) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (!dir_handle) {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: opendir (%s);\n", path);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((dir_entry = readdir (dir_handle))) {</div><div class='del'>-		file = g_strconcat (path, G_DIR_SEPARATOR_S, dir_entry-&gt;d_name,</div><div class='del'>-				    NULL);</div><div class='del'>-		if (_xstat (file, &amp;statbuf) &amp;&amp; S_ISREG (statbuf.st_mode))</div><div class='del'>-			_xunlink (file);</div><div class='del'>-		g_free (file);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-</div><div class='del'>-	if (rmdir (path) == 0) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (errno == ENOENT) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_LOG_WARNING ("ERROR: rmdir (%s);\n", path);</div><div class='del'>-		CAMEL_LOG_FULL_DEBUG ("  Full error text is: (%d) %s\n",</div><div class='del'>-				      errno, strerror(errno));</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='head'>diff --git a/camel/providers/maildir/camel-maildir-folder.h b/camel/providers/maildir/camel-maildir-folder.h<br/>deleted file mode 100644<br/>index 5997da2011..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/camel-maildir-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/camel-maildir-folder.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'>-/* camel-maildir-folder.h : Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@inria.fr&gt; .</div><div class='del'>- *</div><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'>-#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'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-/*  #include "camel-store.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)     (GTK_CHECK_CAST((obj), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolder))</div><div class='del'>-#define CAMEL_MAILDIR_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolderClass))</div><div class='del'>-#define IS_CAMEL_MAILDIR_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_MAILDIR_FOLDER_TYPE))</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'>-	gchar *directory_path;</div><div class='del'>-} CamelMaildirFolder;</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'>-} CamelMaildirFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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'>-</div><div class='del'>-#endif /* CAMEL_MAILDIR_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/maildir/camel-maildir-provider.c b/camel/providers/maildir/camel-maildir-provider.c<br/>deleted file mode 100644<br/>index cd5521adc0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/camel-maildir-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/camel-maildir-provider.c</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'>-/* camel-maildir-provider.c: maildir provider registration code */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@inria.fr&gt; .</div><div class='del'>- *</div><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'>-#include "config.h"</div><div class='del'>-#include "camel-maildir-store.h"</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-log.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelProvider _maildir_provider = {</div><div class='del'>-	(GtkType) 0,</div><div class='del'>-	PROVIDER_STORE,</div><div class='del'>-	"maildir",</div><div class='del'>-	"Maildir provider for Camel",</div><div class='del'>-	"This maildir provider is based on the default MH provider of Camel",</div><div class='del'>-	(GModule *) NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelProvider *</div><div class='del'>-camel_provider_module_init ()</div><div class='del'>-{</div><div class='del'>-	_maildir_provider.object_type = camel_maildir_store_get_type();</div><div class='del'>-	return &amp;_maildir_provider;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/maildir/camel-maildir-store.c b/camel/providers/maildir/camel-maildir-store.c<br/>deleted file mode 100644<br/>index 8f37494003..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/camel-maildir-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/camel-maildir-store.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'>-/* camel-maildir-store.c : class for an maildir store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@inria.fr&gt; .</div><div class='del'>- *</div><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'>-#include "camel-maildir-store.h"</div><div class='del'>-#include "camel-maildir-folder.h"</div><div class='del'>-#include "url-util.h"</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static void _init (CamelStore *store, CamelSession *session,</div><div class='del'>-		   const gchar *url_name);</div><div class='del'>-static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_maildir_store_class_init (</div><div class='del'>-	CamelMaildirStoreClass *camel_maildir_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_maildir_store_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_store_get_type ());</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_store_class-&gt;init = _init;</div><div class='del'>-	camel_store_class-&gt;get_folder = _get_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_maildir_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirStore *maildir_store = CAMEL_MAILDIR_STORE (object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-	</div><div class='del'>-	store-&gt;separator = G_DIR_SEPARATOR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_maildir_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_maildir_store_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_maildir_store_type)	{</div><div class='del'>-		GtkTypeInfo camel_maildir_store_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMaildirStore",</div><div class='del'>-			sizeof (CamelMaildirStore),</div><div class='del'>-			sizeof (CamelMaildirStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_maildir_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_maildir_store_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'>-		camel_maildir_store_type =</div><div class='del'>-			gtk_type_unique (CAMEL_STORE_TYPE,</div><div class='del'>-					 &amp;camel_maildir_store_info);</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 void </div><div class='del'>-_init (CamelStore *store, CamelSession *session, const gchar *url_name)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirStore *maildir_store = CAMEL_MAILDIR_STORE (store);</div><div class='del'>-	Gurl *store_url;</div><div class='del'>-	g_assert (url_name);</div><div class='del'>-</div><div class='del'>-	/* call parent implementation */</div><div class='del'>-	parent_class-&gt;init (store, session, url_name);</div><div class='del'>-	</div><div class='del'>-	/* find the path in the URL*/</div><div class='del'>-	store_url = g_url_new (url_name);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (store_url);</div><div class='del'>-	g_return_if_fail (store_url-&gt;path); </div><div class='del'>-	</div><div class='del'>-	maildir_store-&gt;toplevel_dir = g_strdup (store_url-&gt;path); </div><div class='del'>-</div><div class='del'>-	g_url_free (store_url);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-_get_folder (CamelStore *store, const gchar *folder_name)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirStore *maildir_store = CAMEL_MAILDIR_STORE (store);</div><div class='del'>-	CamelMaildirFolder *new_maildir_folder;</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-</div><div class='del'>-	new_maildir_folder = gtk_type_new (CAMEL_MAILDIR_FOLDER_TYPE);</div><div class='del'>-	new_folder = CAMEL_FOLDER (new_maildir_folder);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (new_folder)-&gt;init_with_store (new_folder, store, NULL);</div><div class='del'>-	CF_CLASS (new_folder)-&gt;set_name (new_folder, folder_name, NULL);</div><div class='del'>-	</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/maildir/camel-maildir-store.h b/camel/providers/maildir/camel-maildir-store.h<br/>deleted file mode 100644<br/>index 1a95ed1436..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/camel-maildir-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/maildir/camel-maildir-store.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-maildirstore.h : class for an maildir store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@inria.fr&gt; .</div><div class='del'>- *</div><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'>-</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'>-</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;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-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)     (GTK_CHECK_CAST((obj), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStore))</div><div class='del'>-#define CAMEL_MAILDIR_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStoreClass))</div><div class='del'>-#define IS_CAMEL_MAILDIR_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_MAILDIR_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'>-	gchar *toplevel_dir;	</div><div class='del'>-} CamelMaildirStore;</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'>-</div><div class='del'>-} CamelMaildirStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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'>-</div><div class='del'>-#endif /* CAMEL_MAILDIR_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/mbox/.cvsignore b/camel/providers/mbox/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/.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/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am<br/>deleted file mode 100644<br/>index 0c9330340b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelmboxincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelmbox.la</div><div class='del'>-provider_DATA = libcamelmbox.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)/libibex			\</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'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-mbox-provider\"	</div><div class='del'>-</div><div class='del'>-libcamelmbox_la_SOURCES = 			\</div><div class='del'>-	camel-mbox-folder.c			\</div><div class='del'>-	camel-mbox-provider.c			\</div><div class='del'>-	camel-mbox-store.c			\</div><div class='del'>-	camel-mbox-summary.c</div><div class='del'>-</div><div class='del'>-libcamelmboxinclude_HEADERS =			\</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'>-</div><div class='del'>-libcamelmbox_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-libcamelmbox_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-#libcamelmbox_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelmbox.urls</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c<br/>deleted file mode 100644<br/>index fb0434af41..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,606 +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-mbox-folder.c : Abstract class for an email folder */</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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999, 2000 Helix Code 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 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'>-</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-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)</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 CamelMboxFolder */</div><div class='del'>-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMBOXS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void mbox_init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-		       CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		       gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void mbox_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static gint mbox_get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-static GPtrArray *mbox_get_uids (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GPtrArray *mbox_get_subfolder_names (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GPtrArray *mbox_get_summary (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void mbox_free_summary (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-static CamelMimeMessage *mbox_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void mbox_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-#if 0</div><div class='del'>-static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex);</div><div class='del'>-static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void mbox_delete_message_by_uid(CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *mbox_summary_get_by_uid(CamelFolder *f, const char *uid);</div><div class='del'>-</div><div class='del'>-static GList *mbox_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static guint32 mbox_get_message_flags (CamelFolder *folder, const char *uid, CamelException *ex);</div><div class='del'>-static void mbox_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set, CamelException *ex);</div><div class='del'>-static gboolean mbox_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name, CamelException *ex);</div><div class='del'>-static void mbox_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value, CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void mbox_finalize (GtkObject *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'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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;init = mbox_init;</div><div class='del'>-	camel_folder_class-&gt;sync = mbox_sync;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = mbox_get_message_count;</div><div class='del'>-	camel_folder_class-&gt;append_message = mbox_append_message;</div><div class='del'>-	camel_folder_class-&gt;get_uids = mbox_get_uids;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder_names = mbox_get_subfolder_names;</div><div class='del'>-	camel_folder_class-&gt;get_summary = mbox_get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = mbox_free_summary;</div><div class='del'>-	camel_folder_class-&gt;expunge = mbox_expunge;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = mbox_get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;delete_message_by_uid = mbox_delete_message_by_uid;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = mbox_search_by_expression;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;summary_get_by_uid = mbox_summary_get_by_uid;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_flags = mbox_get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = mbox_set_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_flag = mbox_get_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = mbox_set_message_user_flag;</div><div class='del'>-</div><div class='del'>-	gtk_object_class-&gt;finalize = mbox_finalize;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-mbox_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	g_free (mbox_folder-&gt;folder_file_path);</div><div class='del'>-	g_free (mbox_folder-&gt;summary_file_path);</div><div class='del'>-	g_free (mbox_folder-&gt;folder_dir_path);</div><div class='del'>-	g_free (mbox_folder-&gt;index_file_path);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;finalize (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_mbox_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_mbox_folder_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_mbox_folder_type)	{</div><div class='del'>-		GtkTypeInfo camel_mbox_folder_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMboxFolder",</div><div class='del'>-			sizeof (CamelMboxFolder),</div><div class='del'>-			sizeof (CamelMboxFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mbox_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_mbox_folder_type = gtk_type_unique (CAMEL_FOLDER_TYPE, &amp;camel_mbox_folder_info);</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'>-static void </div><div class='del'>-mbox_init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-       CamelFolder *parent_folder, const gchar *name, gchar *separator,</div><div class='del'>-       gboolean path_begins_with_sep, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder;</div><div class='del'>-	const gchar *root_dir_path;</div><div class='del'>-	gchar *real_name;</div><div class='del'>-	int forceindex;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	/* call parent method */</div><div class='del'>-	parent_class-&gt;init (folder, parent_store, parent_folder,</div><div class='del'>-			    name, separator, path_begins_with_sep, ex);</div><div class='del'>-	if (camel_exception_get_id (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* we assume that the parent init</div><div class='del'>-	   method checks for the existance of @folder */</div><div class='del'>-	folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = TRUE;</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-	folder-&gt;has_search_capability = TRUE;</div><div class='del'>-</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'>-		CAMEL_MESSAGE_USER;</div><div class='del'>-	/* FIXME: we don't actually preserve user flags right now. */</div><div class='del'>-</div><div class='del'>- 	mbox_folder-&gt;summary = NULL;</div><div class='del'>- 	mbox_folder-&gt;search = NULL;</div><div class='del'>-</div><div class='del'>-	/* now set the name info */</div><div class='del'>-	g_free (mbox_folder-&gt;folder_file_path);</div><div class='del'>-	g_free (mbox_folder-&gt;folder_dir_path);</div><div class='del'>-	g_free (mbox_folder-&gt;index_file_path);</div><div class='del'>-</div><div class='del'>-	root_dir_path = camel_mbox_store_get_toplevel_dir (CAMEL_MBOX_STORE(folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	real_name = g_basename (folder-&gt;full_name);</div><div class='del'>-	mbox_folder-&gt;folder_file_path = g_strdup_printf ("%s/%s", root_dir_path, real_name);</div><div class='del'>-	mbox_folder-&gt;summary_file_path = g_strdup_printf ("%s/%s-ev-summary", root_dir_path, real_name);</div><div class='del'>-	mbox_folder-&gt;folder_dir_path = g_strdup_printf ("%s/%s.sdb", root_dir_path, real_name);</div><div class='del'>-	mbox_folder-&gt;index_file_path = g_strdup_printf ("%s/%s.ibex", root_dir_path, real_name);</div><div class='del'>-</div><div class='del'>-	/* if we have no index file, force it */</div><div class='del'>-	forceindex = stat(mbox_folder-&gt;index_file_path, &amp;st) == -1;</div><div class='del'>-</div><div class='del'>-	printf("loading ibex\n");</div><div class='del'>-	mbox_folder-&gt;index = ibex_open(mbox_folder-&gt;index_file_path, O_CREAT|O_RDWR, 0600);</div><div class='del'>-	printf("loaded ibex\n");</div><div class='del'>-	if (mbox_folder-&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",</div><div class='del'>-			  strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* no summary (disk or memory), and we're proverbially screwed */</div><div class='del'>-	printf("loading summary\n");</div><div class='del'>-	mbox_folder-&gt;summary = camel_mbox_summary_new(mbox_folder-&gt;summary_file_path, mbox_folder-&gt;folder_file_path, mbox_folder-&gt;index);</div><div class='del'>-	if (mbox_folder-&gt;summary == NULL</div><div class='del'>-	    || camel_mbox_summary_load(mbox_folder-&gt;summary, forceindex) == -1) {</div><div class='del'>-		camel_exception_set (ex, </div><div class='del'>-				     CAMEL_EXCEPTION_FOLDER_INVALID, /* FIXME: right error code */</div><div class='del'>-				     "Could not create summary");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	printf("summary loaded\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	if (expunge)</div><div class='del'>-		mbox_expunge(folder, ex);</div><div class='del'>-	else</div><div class='del'>-		camel_mbox_summary_sync(mbox_folder-&gt;summary, FALSE);</div><div class='del'>-</div><div class='del'>-	/* save index */</div><div class='del'>-	if (mbox_folder-&gt;index) {</div><div class='del'>-		ibex_close(mbox_folder-&gt;index);</div><div class='del'>-		mbox_folder-&gt;index = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (mbox_folder-&gt;summary) {</div><div class='del'>-		camel_folder_summary_save ((CamelFolderSummary *)mbox_folder-&gt;summary);</div><div class='del'>-		gtk_object_unref((GtkObject *)mbox_folder-&gt;summary);</div><div class='del'>-		mbox_folder-&gt;summary = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (mbox_folder-&gt;search) {</div><div class='del'>-		gtk_object_unref((GtkObject *)mbox_folder-&gt;search);</div><div class='del'>-		mbox_folder-&gt;search = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	if (camel_mbox_summary_sync(mbox-&gt;summary, TRUE) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID, /* FIXME: right error code */</div><div class='del'>-				      "Could not expunge: %s", strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: check it actually changed */</div><div class='del'>-	gtk_signal_emit_by_name((GtkObject *)folder, "folder_changed", 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-mbox_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	g_assert (mbox_folder-&gt;summary);</div><div class='del'>-	</div><div class='del'>-	return camel_folder_summary_count((CamelFolderSummary *)mbox_folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: this may need some tweaking for performance? */</div><div class='del'>-static void</div><div class='del'>-mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder);</div><div class='del'>-	CamelStream *output_stream = NULL, *filter_stream = NULL;</div><div class='del'>-	CamelMimeFilter *filter_from = NULL;</div><div class='del'>-	struct stat st;</div><div class='del'>-	off_t seek;</div><div class='del'>-	char *xev, last;</div><div class='del'>-	guint32 uid;</div><div class='del'>-</div><div class='del'>-	if (stat(mbox_folder-&gt;folder_file_path, &amp;st) != 0)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	output_stream = camel_stream_fs_new_with_name (mbox_folder-&gt;folder_file_path, O_RDWR, 0600);</div><div class='del'>-	if (output_stream == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (st.st_size) {</div><div class='del'>-		seek = camel_seekable_stream_seek((CamelSeekableStream *)output_stream, st.st_size - 1, SEEK_SET);</div><div class='del'>-		if (++seek != st.st_size)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		/* If the mbox doesn't end with a newline, fix that. */</div><div class='del'>-		if (camel_stream_read (output_stream, &amp;last, 1) != 1)</div><div class='del'>-			goto fail;</div><div class='del'>-		if (last != '\n')</div><div class='del'>-			camel_stream_write (output_stream, "\n", 1);</div><div class='del'>-	} else</div><div class='del'>-		seek = 0;</div><div class='del'>-</div><div class='del'>-	/* assign a new x-evolution header/uid */</div><div class='del'>-	camel_medium_remove_header((CamelMedium *)message, "X-Evolution");</div><div class='del'>-	uid = camel_folder_summary_next_uid((CamelFolderSummary *)mbox_folder-&gt;summary);</div><div class='del'>-	xev = g_strdup_printf("%08x-0000", uid);</div><div class='del'>-	camel_medium_add_header((CamelMedium *)message, "X-Evolution", xev);</div><div class='del'>-	g_free(xev);</div><div class='del'>-</div><div class='del'>-	/* we must write this to the non-filtered stream ... */</div><div class='del'>-	if (camel_stream_write_string (output_stream, "From - \n") == -1)</div><div class='del'>-		goto fail;</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 (CAMEL_DATA_WRAPPER (message), filter_stream) == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_close (filter_stream) == -1)</div><div class='del'>-		goto fail;</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'>-	gtk_object_unref (GTK_OBJECT (filter_from));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (filter_stream));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (output_stream));</div><div class='del'>-</div><div class='del'>-	/* force a summary update - will only update from the new position, if it can */</div><div class='del'>-	camel_mbox_summary_update(mbox_folder-&gt;summary, seek);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_exception_setv (ex, camel_exception_get_id (ex),</div><div class='del'>-				      "Cannot append message to mbox file: %s",</div><div class='del'>-				      camel_exception_get_description (ex));</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",</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-	}</div><div class='del'>-	if (filter_stream) {</div><div class='del'>-		/*camel_stream_close (filter_stream);*/</div><div class='del'>-		gtk_object_unref ((GtkObject *)filter_stream);</div><div class='del'>-	}</div><div class='del'>-	if (output_stream)</div><div class='del'>-		gtk_object_unref ((GtkObject *)output_stream);</div><div class='del'>-</div><div class='del'>-	if (filter_from)</div><div class='del'>-		gtk_object_unref ((GtkObject *)filter_from);</div><div class='del'>-</div><div class='del'>-	/* make sure the file isn't munged by us */</div><div class='del'>-	if (seek != -1) {</div><div class='del'>-		int fd = open(mbox_folder-&gt;folder_file_path, O_WRONLY, 0600);</div><div class='del'>-		if (fd != -1) {</div><div class='del'>-			ftruncate(fd, st.st_size);</div><div class='del'>-			close(fd);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-mbox_get_uids (CamelFolder *folder, CamelException *ex) </div><div class='del'>-{</div><div class='del'>-	GPtrArray *array;</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder;</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)mbox_folder-&gt;summary);</div><div class='del'>-	array = g_ptr_array_new ();</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'>-		CamelMboxMessageInfo *info = (CamelMboxMessageInfo *)camel_folder_summary_index((CamelFolderSummary *)mbox_folder-&gt;summary, i);</div><div class='del'>-		array-&gt;pdata[i] = g_strdup(info-&gt;info.uid);</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'>-static GPtrArray *</div><div class='del'>-mbox_get_subfolder_names (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* No subfolders. */</div><div class='del'>-	return g_ptr_array_new ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_delete_message_by_uid(CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid((CamelFolderSummary *)mf-&gt;summary, uid);</div><div class='del'>-	if (info) {</div><div class='del'>-		info-&gt;flags |=  CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		camel_folder_summary_touch((CamelFolderSummary *)mf-&gt;summary);</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_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder);</div><div class='del'>-	CamelStream *message_stream = NULL;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelMboxMessageInfo *info;</div><div class='del'>-	CamelMimeParser *parser = NULL;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	/* get the message summary info */</div><div class='del'>-	info = (CamelMboxMessageInfo *)camel_folder_summary_uid((CamelFolderSummary *)mbox_folder-&gt;summary, uid);</div><div class='del'>-</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		errno = ENOENT;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if this has no content, its an error in the library */</div><div class='del'>-	g_assert(info-&gt;info.content);</div><div class='del'>-	g_assert(info-&gt;frompos != -1);</div><div class='del'>-</div><div class='del'>-	/* where we read from */</div><div class='del'>-	message_stream = camel_stream_fs_new_with_name (mbox_folder-&gt;folder_file_path, O_RDONLY, 0);</div><div class='del'>-	if (message_stream == NULL)</div><div class='del'>-		goto fail;</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_stream(parser, message_stream);</div><div class='del'>-	gtk_object_unref((GtkObject *)message_stream);</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, &amp;buffer, &amp;len) != HSCAN_FROM) {</div><div class='del'>-		g_warning("File appears truncated");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_mime_parser_tell_start_from(parser) != info-&gt;frompos) {</div><div class='del'>-		g_warning("Summary doesn't match the folder contents!  eek!\n"</div><div class='del'>-			  "  expecting offset %ld got %ld", (long int)info-&gt;frompos,</div><div class='del'>-			  (long int)camel_mime_parser_tell_start_from(parser));</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</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'>-		g_warning("Construction failed");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref((GtkObject *)parser);</div><div class='del'>-</div><div class='del'>-	return message;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-			      "Cannot get message: %s",</div><div class='del'>-			      g_strerror(errno));</div><div class='del'>-</div><div class='del'>-	if (parser)</div><div class='del'>-		gtk_object_unref((GtkObject *)parser);</div><div class='del'>-	if (message)</div><div class='del'>-		gtk_object_unref((GtkObject *)message);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *</div><div class='del'>-mbox_get_summary (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return ((CamelFolderSummary *)mbox_folder-&gt;summary)-&gt;messages;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mbox_free_summary (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get a single message info, by uid */</div><div class='del'>-static const CamelMessageInfo *</div><div class='del'>-mbox_summary_get_by_uid(CamelFolder *f, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)f;</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_uid((CamelFolderSummary *)mbox_folder-&gt;summary, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-mbox_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	if (mbox_folder-&gt;search == NULL) {</div><div class='del'>-		mbox_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(mbox_folder-&gt;search, folder);</div><div class='del'>-	if (mbox_folder-&gt;summary)</div><div class='del'>-		/* FIXME: dont access summary array directly? */</div><div class='del'>-		camel_folder_search_set_summary(mbox_folder-&gt;search, ((CamelFolderSummary *)mbox_folder-&gt;summary)-&gt;messages);</div><div class='del'>-	camel_folder_search_set_body_index(mbox_folder-&gt;search, mbox_folder-&gt;index);</div><div class='del'>-</div><div class='del'>-	return camel_folder_search_execute_expression(mbox_folder-&gt;search, expression, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-mbox_get_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-			CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid((CamelFolderSummary *)mf-&gt;summary, uid);</div><div class='del'>-	if (info)</div><div class='del'>-		return info-&gt;flags;</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'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags,</div><div class='del'>-			guint32 set, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid((CamelFolderSummary *)mf-&gt;summary, uid);</div><div class='del'>-	if (info) {</div><div class='del'>-		info-&gt;flags = (info-&gt;flags &amp; ~flags) | (set &amp; flags) |</div><div class='del'>-			CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		camel_folder_summary_touch((CamelFolderSummary *)mf-&gt;summary);</div><div class='del'>-		gtk_signal_emit_by_name((GtkObject *)folder, "message_changed", uid);</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'>-</div><div class='del'>-static gboolean</div><div class='del'>-mbox_get_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-			    const char *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid((CamelFolderSummary *)mf-&gt;summary, uid);</div><div class='del'>-	if (info)</div><div class='del'>-		return camel_flag_get(&amp;info-&gt;user_flags, name);</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'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mbox_set_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-					const char *name, gboolean value,</div><div class='del'>-					CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid((CamelFolderSummary *)mf-&gt;summary, uid);</div><div class='del'>-	if (info) {</div><div class='del'>-		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((CamelFolderSummary *)mf-&gt;summary);</div><div class='del'>-		gtk_signal_emit_by_name((GtkObject *)folder, "message_changed", uid);</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='head'>diff --git a/camel/providers/mbox/camel-mbox-folder.h b/camel/providers/mbox/camel-mbox-folder.h<br/>deleted file mode 100644<br/>index d7dc361f14..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-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-mbox-folder.h : Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Helix Code .</div><div class='del'>- *</div><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'>-</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'>-</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;gtk/gtk.h&gt;</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;libibex/ibex.h&gt;</div><div class='del'>-#include "camel-mbox-summary.h"</div><div class='del'>-</div><div class='del'>-/*  #include "camel-store.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)     (GTK_CHECK_CAST((obj), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolder))</div><div class='del'>-#define CAMEL_MBOX_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolderClass))</div><div class='del'>-#define IS_CAMEL_MBOX_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_MBOX_FOLDER_TYPE))</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'>-	gchar *folder_file_path;   /* contains the messages */</div><div class='del'>-	gchar *summary_file_path;  /* contains the messages summary */</div><div class='del'>-	gchar *folder_dir_path;    /* contains the subfolders */</div><div class='del'>-	gchar *index_file_path;	   /* index of body contents */</div><div class='del'>-</div><div class='del'>-	ibex *index;		   /* index for this folder */</div><div class='del'>-	CamelMboxSummary *summary;</div><div class='del'>-	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */</div><div class='del'>-} CamelMboxFolder;</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'>-} CamelMboxFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c<br/>deleted file mode 100644<br/>index de206f18ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-provider.c</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'>-/* camel-mbox-provider.c: mbox provider registration 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 (C) 2000 HelixCode (www.helixcode.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 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'>-#include "config.h"</div><div class='del'>-#include "camel-mbox-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'>-</div><div class='del'>-static CamelProvider mbox_provider = {</div><div class='del'>-	"mbox",</div><div class='del'>-	"UNIX mbox-format mail files",</div><div class='del'>-</div><div class='del'>-	"For reading mail delivered by the local system, and for "</div><div class='del'>-	"storing mail on local disk.",</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	0,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-</div><div class='del'>-	NULL</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'>-	mbox_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_mbox_store_get_type();</div><div class='del'>-</div><div class='del'>-	mbox_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);</div><div class='del'>-</div><div class='del'>-	camel_session_register_provider (session, &amp;mbox_provider);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c<br/>deleted file mode 100644<br/>index c2d53f0072..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,228 +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.c : class for an mbox store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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 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'>-</div><div class='del'>-#include &lt;config.h&gt;</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-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'>-/* Returns the class for a CamelMboxStore */</div><div class='del'>-#define CMBOXS_CLASS(so) CAMEL_MBOX_STORE_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (GTK_OBJECT(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'>-				gboolean create, 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 char *get_folder_name (CamelStore *store, const char *folder_name,</div><div class='del'>-			      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'>-	/* 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'>-	camel_store_class-&gt;get_folder_name = get_folder_name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-</div><div class='del'>-	service-&gt;url_flags = CAMEL_SERVICE_URL_NEED_PATH;</div><div class='del'>-</div><div class='del'>-	/* mbox names are filenames, so they are case-sensitive. */</div><div class='del'>-	store-&gt;folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_mbox_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_mbox_store_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_mbox_store_type)	{</div><div class='del'>-		GtkTypeInfo camel_mbox_store_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelMboxStore",</div><div class='del'>-			sizeof (CamelMboxStore),</div><div class='del'>-			sizeof (CamelMboxStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mbox_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mbox_store_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'>-		camel_mbox_store_type = gtk_type_unique (CAMEL_STORE_TYPE, &amp;camel_mbox_store_info);</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'>-const gchar *</div><div class='del'>-camel_mbox_store_get_toplevel_dir (CamelMboxStore *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, gboolean create,</div><div class='del'>-	    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *new_folder;</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_SERVICE (store)-&gt;url-&gt;path,</div><div class='del'>-				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 folder `%s':"</div><div class='del'>-					      "\n%s", folder_name,</div><div class='del'>-					      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 (!create) {</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,</div><div class='del'>-			   S_IRUSR | S_IWUSR);</div><div class='del'>-		g_free (name);</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 folder `%s':"</div><div class='del'>-					      "\n%s", folder_name,</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</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'>-	}</div><div class='del'>-</div><div class='del'>-	new_folder =  gtk_type_new (CAMEL_MBOX_FOLDER_TYPE);</div><div class='del'>-	</div><div class='del'>-	CF_CLASS (new_folder)-&gt;init (new_folder, store, NULL,</div><div class='del'>-				     folder_name, "/", TRUE, ex);</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'>-	char *name, *name2;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf ("%s%s", CAMEL_SERVICE (store)-&gt;url-&gt;path,</div><div class='del'>-				folder_name);</div><div class='del'>-	if (stat (name, &amp;st) == -1) {</div><div class='del'>-		if (errno == ENOENT)</div><div class='del'>-			return;</div><div class='del'>-</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'>-	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'>-	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'>-	/* Delete index and summary first, then the main file. */</div><div class='del'>-	name2 = g_strdup_printf ("%s.ibex", name);</div><div class='del'>-	status = unlink (name2);</div><div class='del'>-	g_free (name2);</div><div class='del'>-	if (status == 0 || errno == ENOENT) {</div><div class='del'>-		name2 = g_strdup_printf ("%s-ev-summary", name);</div><div class='del'>-		status = unlink (name2);</div><div class='del'>-		g_free (name2);</div><div class='del'>-	}</div><div class='del'>-	if (status == 0 || errno == ENOENT)</div><div class='del'>-		status = unlink (name);</div><div class='del'>-	g_free (name);</div><div class='del'>-</div><div class='del'>-	if (status == -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'>-				      folder_name, g_strerror (errno));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_folder_name (CamelStore *store, const char *folder_name,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* For now, we don't allow hieararchy. FIXME. */</div><div class='del'>-	if (strchr (folder_name + 1, '/')) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     "Mbox folders may not be nested.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return *folder_name == '/' ? g_strdup (folder_name) :</div><div class='del'>-		g_strdup_printf ("/%s", folder_name);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/mbox/camel-mbox-store.h b/camel/providers/mbox/camel-mbox-store.h<br/>deleted file mode 100644<br/>index 06a971ada4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-store.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-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 Helix Code, 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 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'>-</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'>-</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;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-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)     (GTK_CHECK_CAST((obj), CAMEL_MBOX_STORE_TYPE, CamelMboxStore))</div><div class='del'>-#define CAMEL_MBOX_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_MBOX_STORE_TYPE, CamelMboxStoreClass))</div><div class='del'>-#define IS_CAMEL_MBOX_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_MBOX_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'>-} CamelMboxStore;</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'>-} CamelMboxStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_mbox_store_get_type (void);</div><div class='del'>-</div><div class='del'>-const gchar *camel_mbox_store_get_toplevel_dir (CamelMboxStore *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_MBOX_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c<br/>deleted file mode 100644<br/>index 40ad7f3a2b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-summary.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,771 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#include "camel-mbox-summary.h"</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</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'>-#define io(x)</div><div class='del'>-#define d(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 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   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelFolderSummaryClass *camel_mbox_summary_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_mbox_summary_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'>-			"CamelMboxSummary",</div><div class='del'>-			sizeof (CamelMboxSummary),</div><div class='del'>-			sizeof (CamelMboxSummaryClass),</div><div class='del'>-			(GtkClassInitFunc) camel_mbox_summary_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_mbox_summary_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 (camel_folder_summary_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'>-camel_mbox_summary_class_init (CamelMboxSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mbox_summary_parent = gtk_type_class (camel_folder_summary_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_mbox_summary_finalise;</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'>-	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'>-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 (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(mbs-&gt;folder_path);</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)(camel_mbox_summary_parent))-&gt;finalize((GtkObject *)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, ibex *index)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *new = CAMEL_MBOX_SUMMARY ( gtk_type_new (camel_mbox_summary_get_type ()));</div><div class='del'>-	if (new) {</div><div class='del'>-		/* ?? */</div><div class='del'>-		camel_folder_summary_set_build_content((CamelFolderSummary *)new, TRUE);</div><div class='del'>-		camel_folder_summary_set_filename((CamelFolderSummary *)new, filename);</div><div class='del'>-		new-&gt;folder_path = g_strdup(mbox_name);</div><div class='del'>-		new-&gt;index = index;</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 int summary_header_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)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_folder_summary_decode_uint32(in, &amp;mbs-&gt;folder_size);</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'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)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_folder_summary_encode_uint32(out, mbs-&gt;folder_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-header_evolution_decode(const char *in, guint32 *uid, guint32 *flags)</div><div class='del'>-{</div><div class='del'>-        char *header;</div><div class='del'>-        if (in</div><div class='del'>-            &amp;&amp; (header = header_token_decode(in))) {</div><div class='del'>-                if (strlen(header) == strlen("00000000-0000")</div><div class='del'>-                    &amp;&amp; sscanf(header, "%08x-%04x", uid, flags) == 2) {</div><div class='del'>-                        g_free(header);</div><div class='del'>-                        return *uid;</div><div class='del'>-                }</div><div class='del'>-                g_free(header);</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 char *</div><div class='del'>-header_evolution_encode(guint32 uid, guint32 flags)</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf("%08x-%04x", uid, flags &amp; 0xffff);</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'>-</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'>-		const char *xev;</div><div class='del'>-		guint32 uid, flags;</div><div class='del'>-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-		xev = header_raw_find(&amp;h, "X-Evolution", NULL);</div><div class='del'>-		if (xev</div><div class='del'>-		    &amp;&amp; header_evolution_decode(xev, &amp;uid, &amp;flags) != -1) {</div><div class='del'>-			g_free(mi-&gt;uid);</div><div class='del'>-			mi-&gt;uid = g_strdup_printf("%u", uid);</div><div class='del'>-			mi-&gt;flags = flags;</div><div class='del'>-		} else {</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'>-			mi-&gt;uid = g_strdup_printf("%u", camel_folder_summary_next_uid(s));</div><div class='del'>-		}</div><div class='del'>-		mbi-&gt;frompos = -1;</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_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)s;</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'>-		/* do we want to index this message as we add it, as well? */</div><div class='del'>-		if (mbs-&gt;index_force</div><div class='del'>-		    || (mi-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) != 0</div><div class='del'>-		    || !ibex_contains_name(mbs-&gt;index, mi-&gt;uid)) {</div><div class='del'>-			camel_folder_summary_set_index(s, mbs-&gt;index);</div><div class='del'>-		} else {</div><div class='del'>-			camel_folder_summary_set_index(s, 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 CamelMessageInfo * 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'>-		camel_folder_summary_decode_uint32(in, &amp;mbi-&gt;frompos);</div><div class='del'>-	}</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int		  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'>-	((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_save(s, out, mi);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_encode_uint32(out, mbi-&gt;frompos);</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)</div><div class='del'>-{</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'>-</div><div class='del'>-	printf("(re)Building summary from %d (%s)\n", (int)offset, mbs-&gt;folder_path);</div><div class='del'>-</div><div class='del'>-	fd = open(mbs-&gt;folder_path, O_RDONLY);</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\nbuilding 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((CamelFolderSummary *)mbs);</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'>-			gtk_object_unref((GtkObject *)mp);</div><div class='del'>-			/* end of file - no content? */</div><div class='del'>-			printf("We radn out of file?\n");</div><div class='del'>-			return -1;</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'>-</div><div class='del'>-		info = camel_folder_summary_add_from_parser((CamelFolderSummary *)mbs, mp);</div><div class='del'>-		if (info == NULL) {</div><div class='del'>-			printf("Could not build info from file?\n");</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'>-	gtk_object_unref((GtkObject *)mp);</div><div class='del'>-	/* update the file size/mtime in the summary */</div><div class='del'>-	if (ok != -1) {</div><div class='del'>-		struct stat st;</div><div class='del'>-</div><div class='del'>-		if (stat (mbs-&gt;folder_path, &amp;st) == 0) {</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'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_mbox_summary_update(CamelMboxSummary *mbs, off_t offset)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mbs-&gt;index_force = FALSE;</div><div class='del'>-	ret = summary_rebuild(mbs, offset);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#warning "Saving full summary and index after every summarisation is slow ..."</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		if (camel_folder_summary_save((CamelFolderSummary *)mbs) == -1)</div><div class='del'>-			g_warning("Could not save summary: %s", strerror(errno));</div><div class='del'>-		printf("summary saved\n");</div><div class='del'>-		if (mbs-&gt;index)</div><div class='del'>-			ibex_save(mbs-&gt;index);</div><div class='del'>-		printf("ibex saved\n");</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_mbox_summary_load(CamelMboxSummary *mbs, int forceindex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	off_t minstart;</div><div class='del'>-</div><div class='del'>-	mbs-&gt;index_force = forceindex;</div><div class='del'>-</div><div class='del'>-	/* is the summary out of date? */</div><div class='del'>-	if (stat(mbs-&gt;folder_path, &amp;st) == -1) {</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-		printf("Cannot summarise folder: '%s': %s\n", mbs-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (forceindex || camel_folder_summary_load(s) == -1) {</div><div class='del'>-		printf ("REBUILDING SUMMARY: %s\n",</div><div class='del'>-			forceindex ? "Summary non-existent." : "Summary load failed.");</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-		ret = summary_rebuild(mbs, 0);</div><div class='del'>-	} else {</div><div class='del'>-		minstart = st.st_size;</div><div class='del'>-#if 0</div><div class='del'>-		/* find out the first unindexed message ... */</div><div class='del'>-		/* TODO: For this to work, it has to check that the message is</div><div class='del'>-		   indexable, and contains content ... maybe it cannot be done </div><div class='del'>-		   properly? */</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'>-			if (!ibex_contains_name(mbs-&gt;index, mi-&gt;uid)) {</div><div class='del'>-				minstart = ((CamelMboxMessageInfo *)mi)-&gt;frompos;</div><div class='del'>-				printf("Found unindexed message: %s\n", mi-&gt;uid);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		/* is the summary uptodate? */</div><div class='del'>-		if (st.st_size == mbs-&gt;folder_size &amp;&amp; st.st_mtime == s-&gt;time) {</div><div class='del'>-			printf("Summary time and date match mbox\n");</div><div class='del'>-			if (minstart &lt; st.st_size) {</div><div class='del'>-				/* FIXME: Only clear the messages and reindex from this point forward */</div><div class='del'>-				printf ("REBUILDING SUMMARY: Index file is incomplete.\n");</div><div class='del'>-				camel_folder_summary_clear(s);</div><div class='del'>-				ret = summary_rebuild(mbs, 0);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (mbs-&gt;folder_size &lt; st.st_size) {</div><div class='del'>-				printf("REBUILDING SUMMARY: Summary is for a smaller mbox\n");</div><div class='del'>-				if (minstart &lt; mbs-&gt;folder_size) {</div><div class='del'>-					/* FIXME: only make it rebuild as necessary */</div><div class='del'>-					camel_folder_summary_clear(s);</div><div class='del'>-					ret = summary_rebuild(mbs, 0);</div><div class='del'>-				} else {</div><div class='del'>-					ret = summary_rebuild(mbs, mbs-&gt;folder_size);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (mbs-&gt;folder_size &gt; st.st_size)</div><div class='del'>-					printf("REBUILDING_SUMMARY: Summary is for a bigger mbox\n");</div><div class='del'>-				else</div><div class='del'>-					printf("REBUILDING SUMMARY: Summary is for an older mbox\n");</div><div class='del'>-				camel_folder_summary_clear(s);</div><div class='del'>-				ret = summary_rebuild(mbs, 0);</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'>-		mbs-&gt;folder_size = st.st_size;</div><div class='del'>-		s-&gt;time = st.st_mtime;</div><div class='del'>-		printf("saving summary\n");</div><div class='del'>-		if (camel_folder_summary_save(s) == -1)</div><div class='del'>-			g_warning("Could not save summary: %s", strerror(errno));</div><div class='del'>-		printf("summary saved\n");</div><div class='del'>-		if (mbs-&gt;index)</div><div class='del'>-			ibex_save(mbs-&gt;index);</div><div class='del'>-		printf("ibex saved\n");</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'>-header_write(int fd, struct _header_raw *header, char *xevline)</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, "X-Evolution")) {</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'>-        iv[0].iov_base = "X-Evolution: ";</div><div class='del'>-        iv[0].iov_len = strlen(iv[0].iov_base);</div><div class='del'>-        iv[1].iov_base = xevline;</div><div class='del'>-        iv[1].iov_len = strlen(xevline);</div><div class='del'>-        iv[2].iov_base = "\n\n";</div><div class='del'>-        iv[2].iov_len = 2;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = writev(fd, iv, 3);</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'>-static int</div><div class='del'>-copy_block(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'>-</div><div class='del'>-int</div><div class='del'>-camel_mbox_summary_sync(CamelMboxSummary *mbs, gboolean expunge)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *mp=NULL;</div><div class='del'>-	int i, count;</div><div class='del'>-	CamelMboxMessageInfo *info;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;</div><div class='del'>-</div><div class='del'>-	int fd=-1, fdout=-1;</div><div class='del'>-	off_t offset = 0;</div><div class='del'>-	char *tmpname=0;</div><div class='del'>-	char *buffer, *xevnew = NULL;</div><div class='del'>-	const char *xev;</div><div class='del'>-	int len;</div><div class='del'>-	guint32 uid, flags;</div><div class='del'>-	int quick = TRUE, work = FALSE;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	/* make sure we're in sync */</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	if (count&gt;0) {</div><div class='del'>-		CamelMessageInfo *mi = camel_folder_summary_index(s, count-1);</div><div class='del'>-		camel_mbox_summary_update(mbs, mi-&gt;content-&gt;endpos);</div><div class='del'>-	} else {</div><div class='del'>-		camel_mbox_summary_update(mbs, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if we have any work to do */</div><div class='del'>-	d(printf("Performing sync, %d messages in inbox\n", count));</div><div class='del'>-	for (i=0;quick &amp;&amp; i&lt;count;i++) {</div><div class='del'>-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);</div><div class='del'>-		if ((expunge &amp;&amp; (info-&gt;info.flags &amp; CAMEL_MESSAGE_DELETED)) ||</div><div class='del'>-		    (info-&gt;info.flags &amp; CAMEL_MESSAGE_FOLDER_NOXEV))</div><div class='del'>-			quick = FALSE;</div><div class='del'>-		else</div><div class='del'>-			work |= (info-&gt;info.flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) != 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("Options: %s %s %s\n", expunge?"expunge":"", quick?"quick":"", work?"Work":""));</div><div class='del'>-</div><div class='del'>-	if (quick &amp;&amp; !work)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	fd = open(mbs-&gt;folder_path, 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_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-</div><div class='del'>-	if (!quick) {</div><div class='del'>-		tmpname = alloca(strlen(mbs-&gt;folder_path)+5);</div><div class='del'>-		sprintf(tmpname, "%s.tmp", mbs-&gt;folder_path);</div><div class='del'>-		d(printf("Writing tmp file to %s\n", tmpname));</div><div class='del'>-	retry_out:</div><div class='del'>-		fdout = open(tmpname, O_WRONLY|O_CREAT|O_EXCL, 0600);</div><div class='del'>-		if (fdout == -1) {</div><div class='del'>-			if (errno == EEXIST)</div><div class='del'>-				if (unlink(tmpname) != -1)</div><div class='del'>-					goto retry_out;</div><div class='del'>-			tmpname = 0;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		off_t frompos, bodypos, lastpos;</div><div class='del'>-		/* This has to be an int, not an off_t, because that's</div><div class='del'>-		 * what camel_mime_parser_header returns... FIXME.</div><div class='del'>-		 */</div><div class='del'>-		int xevoffset;</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", info-&gt;info.uid));</div><div class='del'>-</div><div class='del'>-		if (expunge &amp;&amp; info-&gt;info.flags &amp; CAMEL_MESSAGE_DELETED) {</div><div class='del'>-			d(printf("Deleting %s\n", info-&gt;info.uid));</div><div class='del'>-</div><div class='del'>-			g_assert(!quick);</div><div class='del'>-			offset -= (info-&gt;info.content-&gt;endpos - info-&gt;frompos);</div><div class='del'>-			if (mbs-&gt;index)</div><div class='del'>-				ibex_unindex(mbs-&gt;index, info-&gt;info.uid);</div><div class='del'>-			camel_folder_summary_remove(s, (CamelMessageInfo *)info);</div><div class='del'>-			count--;</div><div class='del'>-			i--;</div><div class='del'>-			info = NULL;</div><div class='del'>-		} else if (info-&gt;info.flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED)) {</div><div class='del'>-			int xevok = FALSE;</div><div class='del'>-</div><div class='del'>-			d(printf("Updating header for %s flags = %08x\n", info-&gt;info.uid, info-&gt;info.flags));</div><div class='del'>-</div><div class='del'>-			/* find the next message, header parts */</div><div class='del'>-			camel_mime_parser_seek(mp, info-&gt;frompos, SEEK_SET);</div><div class='del'>-			if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_FROM)</div><div class='del'>-				goto error;</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("Summary/mbox mismatch, aborting 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, &amp;buffer, &amp;len) == HSCAN_FROM_END)</div><div class='del'>-				goto error;</div><div class='del'>-</div><div class='del'>-			xev = camel_mime_parser_header(mp, "X-Evolution", &amp;xevoffset);</div><div class='del'>-			if (xev &amp;&amp; header_evolution_decode(xev, &amp;uid, &amp;flags) != -1) {</div><div class='del'>-				char name[64];</div><div class='del'>-</div><div class='del'>-				sprintf(name, "%u", uid);</div><div class='del'>-				if (strcmp(name, info-&gt;info.uid)) {</div><div class='del'>-					d(printf("Summary mismatch, aborting leaving mailbox intact\n"));</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				xevok = TRUE;</div><div class='del'>-			}</div><div class='del'>-			xevnew = header_evolution_encode(strtoul(info-&gt;info.uid, NULL, 10), info-&gt;info.flags &amp; 0xffff);</div><div class='del'>-			if (quick) {</div><div class='del'>-				if (!xevok) {</div><div class='del'>-					g_warning("The summary told me I had an X-Evolution header, but i dont!");</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				buffer = g_strdup_printf("X-Evolution: %s", xevnew);</div><div class='del'>-				lastpos = lseek (fd, 0, SEEK_CUR);</div><div class='del'>-				lseek (fd, xevoffset, SEEK_SET);</div><div class='del'>-				do {</div><div class='del'>-					len = write(fd, buffer, strlen(buffer));</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(buffer);</div><div class='del'>-				if (len == -1) {</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				frompos = lseek(fdout, 0, SEEK_CUR);</div><div class='del'>-				write(fdout, "From -\n", strlen("From -\n"));</div><div class='del'>-				if (header_write(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'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				bodypos = lseek(fdout, 0, SEEK_CUR);</div><div class='del'>-				d(printf("pos = %d, endpos = %d, bodypos = %d\n",</div><div class='del'>-					 info-&gt;info.content-&gt;pos,</div><div class='del'>-					 info-&gt;info.content-&gt;endpos,</div><div class='del'>-					 info-&gt;info.content-&gt;bodypos));</div><div class='del'>-				if (copy_block(fd, fdout, info-&gt;info.content-&gt;bodypos,</div><div class='del'>-					       info-&gt;info.content-&gt;endpos - info-&gt;info.content-&gt;bodypos) == -1) {</div><div class='del'>-					g_warning("Cannot copy data to output fd");</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				info-&gt;frompos = frompos;</div><div class='del'>-				offset = bodypos - info-&gt;info.content-&gt;bodypos;</div><div class='del'>-			}</div><div class='del'>-			info-&gt;info.flags &amp;= 0xffff;</div><div class='del'>-			g_free(xevnew); xevnew = NULL;</div><div class='del'>-			camel_mime_parser_drop_step(mp);</div><div class='del'>-			camel_mime_parser_drop_step(mp);</div><div class='del'>-		} else {</div><div class='del'>-			if (!quick) {</div><div class='del'>-				if (copy_block(fd, fdout, info-&gt;frompos,</div><div class='del'>-					       info-&gt;info.content-&gt;endpos - info-&gt;frompos) == -1) {</div><div class='del'>-					g_warning("Cannot copy data to output fd");</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				/* update from pos here? */</div><div class='del'>-				info-&gt;frompos += offset;</div><div class='del'>-			} else {</div><div class='del'>-				d(printf("Nothing to do for this message\n"));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!quick &amp;&amp; info!=NULL &amp;&amp; offset!=0) {</div><div class='del'>-			d(printf("offsetting content: %d\n", offset));</div><div class='del'>-			camel_folder_summary_offset_content(info-&gt;info.content, offset);</div><div class='del'>-			d(printf("pos = %d, endpos = %d, bodypos = %d\n",</div><div class='del'>-				 info-&gt;info.content-&gt;pos,</div><div class='del'>-				 info-&gt;info.content-&gt;endpos,</div><div class='del'>-				 info-&gt;info.content-&gt;bodypos));</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'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!quick) {</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'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rename(tmpname, mbs-&gt;folder_path) == -1) {</div><div class='del'>-			g_warning("Cannot rename folder: %s", strerror(errno));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		tmpname = 0;</div><div class='del'>-</div><div class='del'>-		if (mbs-&gt;index)</div><div class='del'>-			ibex_save(mbs-&gt;index);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stat(mbs-&gt;folder_path, &amp;st) == -1)</div><div class='del'>-		goto error;</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'>-	mbs-&gt;folder_size = st.st_size;</div><div class='del'>-	camel_folder_summary_save(s);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)mp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-error:</div><div class='del'>-	d(printf("Error occured: %s\n", strerror(errno)));</div><div class='del'>-	count = errno;</div><div class='del'>-</div><div class='del'>-	close(fd);</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'>-		gtk_object_unref((GtkObject *)mp);</div><div class='del'>-</div><div class='del'>-	errno = count;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/mbox/camel-mbox-summary.h b/camel/providers/mbox/camel-mbox-summary.h<br/>deleted file mode 100644<br/>index ad7af33e91..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-summary.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/camel-mbox-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#ifndef _CAMEL_MBOX_SUMMARY_H</div><div class='del'>-#define _CAMEL_MBOX_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MBOX_SUMMARY(obj)         GTK_CHECK_CAST (obj, camel_mbox_summary_get_type (), CamelMboxSummary)</div><div class='del'>-#define CAMEL_MBOX_SUMMARY_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mbox_summary_get_type (), CamelMboxSummaryClass)</div><div class='del'>-#define IS_CAMEL_MBOX_SUMMARY(obj)      GTK_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'>-/* extra summary flags */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_NOXEV = 1&lt;&lt;17,</div><div class='del'>-};</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'>-	CamelFolderSummary parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMboxSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *folder_path;	/* name of matching folder */</div><div class='del'>-	size_t folder_size;	/* size of the mbox file, last sync */</div><div class='del'>-</div><div class='del'>-	ibex *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 _CamelMboxSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		camel_mbox_summary_get_type	(void);</div><div class='del'>-CamelMboxSummary      *camel_mbox_summary_new	(const char *filename, const char *mbox_name, ibex *index);</div><div class='del'>-</div><div class='del'>-/* load/check the summary */</div><div class='del'>-int camel_mbox_summary_load(CamelMboxSummary *mbs, int forceindex);</div><div class='del'>-/* incremental update */</div><div class='del'>-int camel_mbox_summary_update(CamelMboxSummary *mbs, off_t offset);</div><div class='del'>-/* perform a folder sync or expunge, if needed */</div><div class='del'>-int camel_mbox_summary_sync (CamelMboxSummary *mbs, gboolean expunge);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MBOX_SUMMARY_H */</div><div class='head'>diff --git a/camel/providers/mbox/libcamelmbox.urls b/camel/providers/mbox/libcamelmbox.urls<br/>deleted file mode 100644<br/>index e021190356..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/libcamelmbox.urls?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/mbox/libcamelmbox.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-mbox</div><div class='head'>diff --git a/camel/providers/nntp/.cvsignore b/camel/providers/nntp/.cvsignore<br/>deleted file mode 100644<br/>index 1f5b9d35fb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/.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'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-newsrc</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 a205f5bb83..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelnntpincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelnntp.la</div><div class='del'>-provider_DATA = libcamelnntp.urls</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	$(GTK_INCLUDEDIR) -I$(top_srcdir)/camel	\</div><div class='del'>-	-I$(srcdir)/../mbox			\</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-folder.c			\</div><div class='del'>-	camel-nntp-newsrc.c			\</div><div class='del'>-	camel-nntp-provider.c			\</div><div class='del'>-	camel-nntp-store.c			\</div><div class='del'>-	camel-nntp-utils.c</div><div class='del'>-</div><div class='del'>-libcamelnntpinclude_HEADERS =			\</div><div class='del'>-	camel-nntp-folder.h			\</div><div class='del'>-	camel-nntp-newsrc.h			\</div><div class='del'>-	camel-nntp-store.h</div><div class='del'>-</div><div class='del'>-libcamelnntp_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelnntp.urls</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS = test-newsrc</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'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)</div><div class='del'>-#	$(BONOBO_LIBS)				</div><div class='del'>-</div><div class='del'>-test_newsrc_LDADD = libcamelnntp.la $(LDADD)</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 a3cfc49d26..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,469 +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 : Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code .</div><div class='del'>- *</div><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'>-</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-folder-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-utils.h"</div><div class='del'>-</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-stream-buffer.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-folder-summary.h"</div><div class='del'>-</div><div class='del'>-#include "camel-exception.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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void _check_get_or_maybe_generate_summary_file (CamelNNTPFolder *nntp_folder,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-nntp_folder_init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-		  CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		  gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const gchar *root_dir_path;</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	/* call parent method */</div><div class='del'>-	parent_class-&gt;init (folder, parent_store, parent_folder,</div><div class='del'>-			    name, separator, path_begins_with_sep,</div><div class='del'>-			    ex);</div><div class='del'>-	if (camel_exception_get_id (ex)) return;</div><div class='del'>-</div><div class='del'>-	/* set flags */</div><div class='del'>-</div><div class='del'>-	if (!strcmp (name, "/")) {</div><div class='del'>-		/* the root folder is the only folder that has "subfolders" */</div><div class='del'>-		folder-&gt;can_hold_folders = TRUE;</div><div class='del'>-		folder-&gt;can_hold_messages = FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		folder-&gt;can_hold_folders = FALSE;</div><div class='del'>-		folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-		folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XX */</div><div class='del'>-	nntp_folder-&gt;group_name = g_strdup (strrchr (name, '/') + 1);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* get (or create) uid list */</div><div class='del'>-	if (!(nntp_load_uid_list (nntp_folder) &gt; 0))</div><div class='del'>-		nntp_generate_uid_list (nntp_folder);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	root_dir_path = camel_nntp_store_get_toplevel_dir (CAMEL_NNTP_STORE(folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	nntp_folder-&gt;summary_file_path = g_strdup_printf ("%s/%s-ev-summary",</div><div class='del'>-							  root_dir_path, nntp_folder-&gt;group_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_sync (CamelFolder *folder, gboolean expunge, </div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_folder_summary_save (CAMEL_NNTP_FOLDER(folder)-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-nntp_folder_get_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_assert(0);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-nntp_folder_get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_assert(0);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder*</div><div class='del'>-nntp_folder_get_subfolder (CamelFolder *folder,</div><div class='del'>-			   const gchar *folder_name,</div><div class='del'>-			   gboolean create,</div><div class='del'>-			   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_assert (0);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-nntp_folder_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	g_assert (folder);</div><div class='del'>-	g_assert (nntp_folder-&gt;summary);</div><div class='del'>-</div><div class='del'>-        return camel_folder_summary_count(nntp_folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-nntp_folder_get_message_flags (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	CamelMessageInfo *info = camel_folder_summary_uid (nntp_folder-&gt;summary, uid);</div><div class='del'>-</div><div class='del'>-	return info-&gt;flags;</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,</div><div class='del'>-			       guint32 flags, guint32 set, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	CamelMessageInfo *info = camel_folder_summary_uid (nntp_folder-&gt;summary, uid);</div><div class='del'>-</div><div class='del'>-	info-&gt;flags = set;</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_touch (nntp_folder-&gt;summary);</div><div class='del'>-	if (set &amp; CAMEL_MESSAGE_SEEN) {</div><div class='del'>-		CamelNNTPStore *store;</div><div class='del'>-		CamelException *ex;</div><div class='del'>-		</div><div class='del'>-		ex = camel_exception_new ();</div><div class='del'>-		store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder, ex));</div><div class='del'>-		camel_exception_free (ex);</div><div class='del'>-</div><div class='del'>-		camel_nntp_newsrc_mark_article_read (store-&gt;newsrc,</div><div class='del'>-						     nntp_folder-&gt;group_name,</div><div class='del'>-						     1 /* XXX */);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const gchar*</div><div class='del'>-nntp_folder_get_message_uid (CamelFolder *folder,</div><div class='del'>-			     CamelMimeMessage *message,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_assert (0);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-nntp_folder_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStream *nntp_istream;</div><div class='del'>-	CamelStream *message_stream;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelStore *parent_store;</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 status;</div><div class='del'>-	gboolean done;</div><div class='del'>-</div><div class='del'>-	/* get the parent store */</div><div class='del'>-	parent_store = camel_folder_get_parent_store (folder, ex);</div><div class='del'>-	if (camel_exception_get_id (ex)) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = camel_nntp_command (CAMEL_NNTP_STORE( parent_store ), NULL, "ARTICLE %s", uid);</div><div class='del'>-</div><div class='del'>-	nntp_istream = CAMEL_NNTP_STORE (parent_store)-&gt;istream;</div><div class='del'>-</div><div class='del'>-	/* if the uid was not found, raise an exception and return */</div><div class='del'>-	if (status != CAMEL_NNTP_OK) {</div><div class='del'>-		camel_exception_setv (ex, </div><div class='del'>-				     CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     "message %s not found.",</div><div class='del'>-				      uid);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX ick ick ick.  read the entire message into a buffer and</div><div class='del'>-	   then create a stream_mem for it. */</div><div class='del'>-	buf_alloc = 2048;</div><div class='del'>-	buf_len = 0;</div><div class='del'>-	buf = 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'>-	while (!done) {</div><div class='del'>-		char *line = camel_stream_buffer_read_line ( CAMEL_STREAM_BUFFER ( nntp_istream ));</div><div class='del'>-		int line_length;</div><div class='del'>-</div><div class='del'>-		/* XXX check exception */</div><div class='del'>-</div><div class='del'>-		line_length = strlen ( line );</div><div class='del'>-</div><div class='del'>-		if (!strcmp(line, ".")) {</div><div class='del'>-			done = TRUE;</div><div class='del'>-			g_free (line);</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 = 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) + 1;</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 bound to the message */</div><div class='del'>-	message_stream = camel_stream_mem_new_with_buffer(buf, buf_len);</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'>-		gtk_object_unref ((GtkObject *)message);</div><div class='del'>-		gtk_object_unref ((GtkObject *)message_stream);</div><div class='del'>-		camel_exception_setv (ex,</div><div class='del'>-				      CAMEL_EXCEPTION_FOLDER_INVALID_UID, /* XXX */</div><div class='del'>-				      "Could not create message for uid %s.", uid);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref ((GtkObject *)message_stream);</div><div class='del'>-</div><div class='del'>-	/* init other fields? */</div><div class='del'>-	gtk_object_ref((GtkObject *)folder);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect((GtkObject *)message, "message_changed", message_changed, folder);</div><div class='del'>-#endif</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'>-nntp_folder_delete_message_by_uid (CamelFolder *folder,</div><div class='del'>-				   const gchar *uid,</div><div class='del'>-				   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_assert (0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-nntp_folder_get_uids (CamelFolder *folder,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	GPtrArray *message_info_array, *out;</div><div class='del'>-	CamelMessageInfo *message_info;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	message_info_array = nntp_folder-&gt;summary-&gt;messages;</div><div class='del'>-</div><div class='del'>-	out = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (out, message_info_array-&gt;len);</div><div class='del'>-	</div><div class='del'>-	for (i=0; i&lt;message_info_array-&gt;len; i++) {</div><div class='del'>-		message_info = (CamelMessageInfo *)(message_info_array-&gt;pdata) + i;</div><div class='del'>-		out-&gt;pdata[i] = g_strdup (message_info-&gt;uid);</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 void</div><div class='del'>-nntp_folder_free_uids (CamelFolder *folder,</div><div class='del'>-		       GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; array-&gt;len; i ++) {</div><div class='del'>-		g_free (g_ptr_array_index (array, i));</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free (array, TRUE /* XXX? */);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-nntp_folder_get_summary (CamelFolder *folder,</div><div class='del'>-			 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	_check_get_or_maybe_generate_summary_file (nntp_folder, ex);</div><div class='del'>-</div><div class='del'>-	return nntp_folder-&gt;summary-&gt;messages;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_free_summary (CamelFolder *folder,</div><div class='del'>-			  GPtrArray *summary)</div><div class='del'>-{</div><div class='del'>-	g_assert (0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-nntp_folder_get_subfolder_names (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp (folder-&gt;name, "/")) {</div><div class='del'>-		CamelStore *store = camel_folder_get_parent_store (folder, ex);</div><div class='del'>-		GPtrArray *array = camel_nntp_newsrc_get_subscribed_group_names (CAMEL_NNTP_STORE (store)-&gt;newsrc);</div><div class='del'>-		return array;</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'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders)</div><div class='del'>-{</div><div class='del'>-	if (subfolders) {</div><div class='del'>-		CamelException *ex = camel_exception_new ();</div><div class='del'>-		CamelStore *store = camel_folder_get_parent_store (folder, ex);</div><div class='del'>-		camel_nntp_newsrc_free_group_names (CAMEL_NNTP_STORE (store)-&gt;newsrc, subfolders);</div><div class='del'>-		camel_exception_free (ex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList*</div><div class='del'>-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_assert (0);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo*</div><div class='del'>-nntp_folder_summary_get_by_uid (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_assert(0);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-nntp_folder_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	g_free (nntp_folder-&gt;summary_file_path);</div><div class='del'>-</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'>-camel_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'>-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (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;init = nntp_folder_init;</div><div class='del'>-	camel_folder_class-&gt;sync = nntp_folder_sync;</div><div class='del'>-	camel_folder_class-&gt;get_name = nntp_folder_get_name;</div><div class='del'>-	camel_folder_class-&gt;get_full_name = nntp_folder_get_full_name;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder = nntp_folder_get_subfolder;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = nntp_folder_get_message_count;</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_flags = nntp_folder_get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_uid = nntp_folder_get_message_uid;</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = nntp_folder_get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;delete_message_by_uid = nntp_folder_delete_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;get_uids = nntp_folder_get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = nntp_folder_free_uids;</div><div class='del'>-	camel_folder_class-&gt;get_summary = nntp_folder_get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = nntp_folder_free_summary;</div><div class='del'>-	camel_folder_class-&gt;get_subfolder_names = nntp_folder_get_subfolder_names;</div><div class='del'>-	camel_folder_class-&gt;free_subfolder_names = nntp_folder_free_subfolder_names;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = nntp_folder_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;summary_get_by_uid = nntp_folder_summary_get_by_uid;</div><div class='del'>-</div><div class='del'>-	gtk_object_class-&gt;finalize = nntp_folder_finalize;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_nntp_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_nntp_folder_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_nntp_folder_type)	{</div><div class='del'>-		GtkTypeInfo camel_nntp_folder_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelNNTPFolder",</div><div class='del'>-			sizeof (CamelNNTPFolder),</div><div class='del'>-			sizeof (CamelNNTPFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_nntp_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_nntp_folder_type = gtk_type_unique (CAMEL_FOLDER_TYPE, &amp;camel_nntp_folder_info);</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'>-/* internal method used to : </div><div class='del'>-   - test for the existence of a summary file </div><div class='del'>-   - test the sync between the summary and the newsgroup</div><div class='del'>-   - load the summary or create it if necessary </div><div class='del'>-*/ </div><div class='del'>-static void</div><div class='del'>-_check_get_or_maybe_generate_summary_file (CamelNNTPFolder *nntp_folder,</div><div class='del'>-					   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (nntp_folder);</div><div class='del'>-</div><div class='del'>-	nntp_folder-&gt;summary = camel_folder_summary_new ();</div><div class='del'>-	camel_folder_summary_set_filename (nntp_folder-&gt;summary, nntp_folder-&gt;summary_file_path);</div><div class='del'>-</div><div class='del'>-	if (-1 == camel_folder_summary_load (nntp_folder-&gt;summary)) {</div><div class='del'>-		/* Bad or nonexistant summary file */</div><div class='del'>-		camel_nntp_get_headers (CAMEL_FOLDER( folder )-&gt;parent_store, nntp_folder, ex);</div><div class='del'>-		if (camel_exception_get_id (ex))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* XXX check return value */</div><div class='del'>-		camel_folder_summary_save (nntp_folder-&gt;summary);</div><div class='del'>-	}</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 f6c04bb005..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-folder.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-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@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code .</div><div class='del'>- *</div><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'>-</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 &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "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)     (GTK_CHECK_CAST((obj), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolder))</div><div class='del'>-#define CAMEL_NNTP_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass))</div><div class='del'>-#define IS_CAMEL_NNTP_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_NNTP_FOLDER_TYPE))</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'>-	gchar *group_name;</div><div class='del'>-	gchar *summary_file_path;  /* contains the messages summary */</div><div class='del'>-	CamelFolderSummary *summary;</div><div class='del'>-} CamelNNTPFolder;</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'>-} CamelNNTPFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_nntp_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_NNTP_FOLDER_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 fc0f4c2a1a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-newsrc.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-newsrc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,461 +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 Helix Code, Inc. &lt;toshok@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 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'>-#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 "camel-nntp-newsrc.h"</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'>-	GHashTable *subscribed_groups;</div><div class='del'>-	gboolean dirty;</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, 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'>-	if (subscribed)</div><div class='del'>-		g_hash_table_insert (newsrc-&gt;subscribed_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 long</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-&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 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, char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</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'>-	return camel_nntp_newsrc_group_get_highest_article_read (newsrc, group);</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, 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, 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'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</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'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_nntp_newsrc_article_is_read (CamelNNTPNewsrc *newsrc, 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'>-</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-	</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'>-			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'>-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'>-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'>-	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;subscribed_groups,</div><div class='del'>-			      (GHFunc)get_group_foreach, &amp;npa);</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'>-	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'>-	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'>-	int line_length = 0;</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'>-	line_length += strlen(group-&gt;name) + 1;</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'>-	line_length += 1;</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'>-		/* this constant (991) gives the same line breaking as faried's .newsrc file */</div><div class='del'>-		if (line_length + strlen(range_buffer) &gt; 991 /*XXX*/) {</div><div class='del'>-			char range_buffer2[101];</div><div class='del'>-			int num_to_print = 991 - line_length;</div><div class='del'>-</div><div class='del'>-			strcpy(range_buffer2, range_buffer);</div><div class='del'>-			range_buffer2[num_to_print] = '!';</div><div class='del'>-			range_buffer2[num_to_print+1] = '\n';</div><div class='del'>-			range_buffer2[num_to_print+2] = '\0';</div><div class='del'>-</div><div class='del'>-			fprintf (fp, range_buffer2);</div><div class='del'>-</div><div class='del'>-			fprintf (fp, range_buffer + num_to_print);</div><div class='del'>-</div><div class='del'>-			line_length = strlen(range_buffer) - num_to_print;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			fprintf (fp, range_buffer);</div><div class='del'>-			line_length += strlen(range_buffer);</div><div class='del'>-		}</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'>-	newsrc_fp.newsrc = newsrc;</div><div class='del'>-	newsrc_fp.fp = fp;</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'>-</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'>-	if (!newsrc-&gt;dirty)</div><div class='del'>-		return;</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'>-		return;</div><div class='del'>-	}</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, sep, *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'>-	sep = *p;</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'>-	*p = sep;</div><div class='del'>-</div><div class='del'>-	p++;</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'>-#define MAX_LINE_LENGTH 1500</div><div class='del'>-#define BUFFER_LENGTH (20 * MAX_LINE_LENGTH)</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'>-	FILE *fp;</div><div class='del'>-	char buf[BUFFER_LENGTH];</div><div class='del'>-	CamelNNTPNewsrc *newsrc = g_new0(CamelNNTPNewsrc, 1);</div><div class='del'>-</div><div class='del'>-	newsrc-&gt;filename = g_strdup_printf ("%s/.newsrc-%s", g_get_home_dir(), server);</div><div class='del'>-	newsrc-&gt;groups = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	newsrc-&gt;subscribed_groups = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if ((fp = fopen(newsrc-&gt;filename, "r")) == NULL) {</div><div class='del'>-		g_free (newsrc-&gt;filename);</div><div class='del'>-		g_free (newsrc);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (fgets(buf, MAX_LINE_LENGTH, fp) != NULL) {</div><div class='del'>-		/* we silently ignore (and lose!) lines longer than 20 * 1500 chars.</div><div class='del'>-		   Too bad for them.  */</div><div class='del'>-		while(strlen(buf) &lt; sizeof(buf) </div><div class='del'>-		      &amp;&amp; buf[strlen(buf) - 2] == '!') {</div><div class='del'>-			fgets(&amp;buf[strlen(buf) - 2], MAX_LINE_LENGTH, fp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_nntp_newsrc_parse_line(newsrc, buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose(fp);</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 3f4be6de8d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-newsrc.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-newsrc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +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, char *group_name);</div><div class='del'>-void      camel_nntp_newsrc_mark_article_read           (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							 char *group_name, int num);</div><div class='del'>-void      camel_nntp_newsrc_mark_range_read             (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							 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'>-							 char *group_name, long num);</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='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 4afc8c7c97..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-provider.c</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-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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-#include "config.h"</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 CamelProvider news_provider = {</div><div class='del'>-	"news",</div><div class='del'>-	"USENET news",</div><div class='del'>-</div><div class='del'>-	"This is a read-only provider for USENET newsgroups.",</div><div class='del'>-</div><div class='del'>-	"news",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider nntp_provider = {</div><div class='del'>-	"nntp",</div><div class='del'>-	"USENET news via NNTP",</div><div class='del'>-</div><div class='del'>-	"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,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 }</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'>-#ifdef NOTYET</div><div class='del'>-	nntp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =</div><div class='del'>-		camel_nntp_transport_get_type();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	camel_session_register_provider (session, &amp;news_provider);</div><div class='del'>-	camel_session_register_provider (session, &amp;nntp_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/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c<br/>deleted file mode 100644<br/>index 765cd8796b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,487 +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) 2000 Helix Code, Inc. &lt;toshok@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 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'>-</div><div class='del'>-#include &lt;config.h&gt;</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;dirent.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;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 "libgnome/libgnome.h"</div><div class='del'>-</div><div class='del'>-#include "camel-folder-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-stream-buffer.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#define NNTP_PORT 119</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 (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (GTK_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static gboolean nntp_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean nntp_disconnect (CamelService *service, CamelException *ex);</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 gchar *folder_name,</div><div class='del'>-		       gboolean get_folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *new_nntp_folder;</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	/* if we haven't already read our .newsrc, read it now */</div><div class='del'>-	if (!nntp_store-&gt;newsrc)</div><div class='del'>-		nntp_store-&gt;newsrc = camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)-&gt;url-&gt;host);</div><div class='del'>-</div><div class='del'>-	/* check if folder has already been created */</div><div class='del'>-	/* call the standard routine for that when  */</div><div class='del'>-	/* it is done ... */</div><div class='del'>-</div><div class='del'>-	new_nntp_folder =  gtk_type_new (CAMEL_NNTP_FOLDER_TYPE);</div><div class='del'>-	new_folder = CAMEL_FOLDER (new_nntp_folder);</div><div class='del'>-	</div><div class='del'>-	/* XXX We shouldn't be passing NULL here, but it's equivalent to</div><div class='del'>-	 * what was there before, and there's no</div><div class='del'>-	 * CamelNNTPFolder::get_subfolder yet anyway...</div><div class='del'>-	 */</div><div class='del'>-	CF_CLASS (new_folder)-&gt;init (new_folder, store, NULL,</div><div class='del'>-				     folder_name, ".", FALSE, ex);</div><div class='del'>-	</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-nntp_store_get_folder_name (CamelStore *store, const char *folder_name,</div><div class='del'>-			    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup (folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_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'>-</div><div class='del'>-	service_class = gtk_type_class (camel_service_get_type ());</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_store_class-&gt;get_folder = nntp_store_get_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_name = nntp_store_get_folder_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'>-camel_nntp_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-</div><div class='del'>-	service-&gt;url_flags = CAMEL_SERVICE_URL_NEED_HOST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_nntp_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_nntp_store_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_nntp_store_type)	{</div><div class='del'>-		GtkTypeInfo camel_nntp_store_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelNNTPStore",</div><div class='del'>-			sizeof (CamelNNTPStore),</div><div class='del'>-			sizeof (CamelNNTPStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_nntp_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_nntp_store_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'>-		camel_nntp_store_type = gtk_type_unique (CAMEL_STORE_TYPE, &amp;camel_nntp_store_info);</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'>-/**</div><div class='del'>- * camel_nntp_store_open: Connect to the server if we are currently</div><div class='del'>- * disconnected.</div><div class='del'>- * @store: the store</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_nntp_store_open (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (store);</div><div class='del'>-	if (!camel_service_is_connected (service))</div><div class='del'>-		nntp_connect (service, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_nntp_store_close: Close the connection to the server</div><div class='del'>- * @store: the store</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_nntp_store_close (CamelNNTPStore *store, gboolean expunge,</div><div class='del'>-			CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_nntp_command (store, NULL, "QUIT");</div><div class='del'>-</div><div class='del'>-	nntp_disconnect (CAMEL_SERVICE (store), ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-nntp_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	int fd;</div><div class='del'>-	char *buf;</div><div class='del'>-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);</div><div class='del'>-</div><div class='del'>-	if (!service_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'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	sin.sin_port = htons (service-&gt;url-&gt;port ? service-&gt;url-&gt;port : NNTP_PORT);</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'>-	if (fd == -1 ||</div><div class='del'>-	    connect (fd, (struct sockaddr *)&amp;sin, sizeof(sin)) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not connect to %s (port %s): %s",</div><div class='del'>-				      service-&gt;url-&gt;host, service-&gt;url-&gt;port,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		if (fd &gt; -1)</div><div class='del'>-			close (fd);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	store-&gt;ostream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	store-&gt;istream = camel_stream_buffer_new (store-&gt;ostream,</div><div class='del'>-						  CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-</div><div class='del'>-	/* Read the greeting */</div><div class='del'>-	buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store-&gt;istream));</div><div class='del'>-	if (!buf) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	/* get a list of extensions that the server supports */</div><div class='del'>-	if (CAMEL_NNTP_OK == camel_nntp_command (store, NULL, "LIST EXTENSIONS")) {</div><div class='del'>-		char *ext_response = camel_nntp_command_get_additional_data(store);</div><div class='del'>-</div><div class='del'>-		g_free (ext_response);</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'>-nntp_disconnect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store = CAMEL_NNTP_STORE (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'>-	if (!service_class-&gt;disconnect (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (store-&gt;ostream));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (store-&gt;istream));</div><div class='del'>-	store-&gt;ostream = NULL;</div><div class='del'>-	store-&gt;istream = NULL;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_nntp_command: Send a command to a NNTP server.</div><div class='del'>- * @store: the NNTP store</div><div class='del'>- * @ret: a pointer to return the full server response in</div><div class='del'>- * @fmt: a printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This command sends the command specified by @fmt and the following</div><div class='del'>- * arguments to the connected NNTP store specified by @store. It then</div><div class='del'>- * reads the server's response and parses out the status code. If</div><div class='del'>- * the caller passed a non-NULL pointer for @ret, camel_nntp_command</div><div class='del'>- * will set it to point to an buffer containing the rest of the</div><div class='del'>- * response from the NNTP server. (If @ret was passed but there was</div><div class='del'>- * no extended response, @ret will be set to NULL.) The caller must</div><div class='del'>- * free this buffer when it is done with it.</div><div class='del'>- *</div><div class='del'>- * Return value: one of CAMEL_NNTP_OK (command executed successfully),</div><div class='del'>- * CAMEL_NNTP_ERR (command encounted an error), or CAMEL_NNTP_FAIL</div><div class='del'>- * (a protocol-level error occurred, and Camel is uncertain of the</div><div class='del'>- * result of the command.)</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_nntp_command (CamelNNTPStore *store, char **ret, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	char *cmdbuf, *respbuf;</div><div class='del'>-	va_list ap;</div><div class='del'>-	int status;</div><div class='del'>-	int resp_code;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	cmdbuf = g_strdup_vprintf (fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* make sure we're connected */</div><div class='del'>-	if (store-&gt;ostream == NULL)</div><div class='del'>-		nntp_connect (CAMEL_SERVICE (store), ex);</div><div class='del'>-</div><div class='del'>-	if (camel_exception_get_id (ex)) {</div><div class='del'>-		camel_exception_free (ex);</div><div class='del'>-		return CAMEL_NNTP_FAIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send the command */</div><div class='del'>-	camel_stream_write (store-&gt;ostream, cmdbuf, strlen (cmdbuf));</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	camel_stream_write (store-&gt;ostream, "\r\n", 2);</div><div class='del'>-</div><div class='del'>-	/* Read the response */</div><div class='del'>-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store-&gt;istream));</div><div class='del'>-	resp_code = atoi (respbuf);</div><div class='del'>-</div><div class='del'>-	if (resp_code &lt; 400)</div><div class='del'>-		status = CAMEL_NNTP_OK;</div><div class='del'>-	else if (resp_code &lt; 500)</div><div class='del'>-		status = CAMEL_NNTP_ERR;</div><div class='del'>-	else</div><div class='del'>-		status = CAMEL_NNTP_FAIL;</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		*ret = strchr (respbuf, ' ');</div><div class='del'>-		if (*ret)</div><div class='del'>-			*ret = g_strdup (*ret + 1);</div><div class='del'>-	}</div><div class='del'>-	g_free (respbuf);</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'>- * camel_nntp_command_get_additional_data: get "additional data" from</div><div class='del'>- * a NNTP command.</div><div class='del'>- * @store: the NNTP store</div><div class='del'>- *</div><div class='del'>- * This command gets the additional data returned by</div><div class='del'>- * This command gets the additional data returned by "multi-line" POP</div><div class='del'>- * commands, such as LIST, RETR, TOP, and UIDL. This command _must_</div><div class='del'>- * be called after a successful (CAMEL_NNTP_OK) call to</div><div class='del'>- * camel_nntp_command for a command that has a multi-line response.</div><div class='del'>- * The returned data is un-byte-stuffed, and has lines termined by</div><div class='del'>- * newlines rather than CR/LF pairs.</div><div class='del'>- *</div><div class='del'>- * Return value: the data, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_nntp_command_get_additional_data (CamelNNTPStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store-&gt;istream);</div><div class='del'>-	GPtrArray *data;</div><div class='del'>-	char *buf;</div><div class='del'>-	int i, status = CAMEL_NNTP_OK;</div><div class='del'>-</div><div class='del'>-	data = g_ptr_array_new ();</div><div class='del'>-	while (1) {</div><div class='del'>-		buf = camel_stream_buffer_read_line (stream);</div><div class='del'>-		if (!buf) {</div><div class='del'>-			status = CAMEL_NNTP_FAIL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp (buf, "."))</div><div class='del'>-			break;</div><div class='del'>-		if (*buf == '.')</div><div class='del'>-			memmove (buf, buf + 1, strlen (buf));</div><div class='del'>-		g_ptr_array_add (data, buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status == CAMEL_NNTP_OK) {</div><div class='del'>-		/* Append an empty string to the end of the array</div><div class='del'>-		 * so when we g_strjoinv it, we get a "\n" after</div><div class='del'>-		 * the last real line.</div><div class='del'>-		 */</div><div class='del'>-		g_ptr_array_add (data, "");</div><div class='del'>-		g_ptr_array_add (data, NULL);</div><div class='del'>-		buf = g_strjoinv ("\n", (char **)data-&gt;pdata);</div><div class='del'>-	} else</div><div class='del'>-		buf = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; data-&gt;len - 2; i++)</div><div class='del'>-		g_free (data-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (data, TRUE);</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_store_subscribe_group (CamelStore *store,</div><div class='del'>-				  const gchar *group_name)</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'>-	char *ret = NULL;</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	if (camel_exception_get_id (ex)) {</div><div class='del'>-		g_free (root_dir);</div><div class='del'>-		camel_exception_free (ex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (CAMEL_NNTP_OK  == camel_nntp_command ( CAMEL_NNTP_STORE (store),</div><div class='del'>-						   &amp;ret, "GROUP %s", group_name)) {</div><div class='del'>-		/* we create an empty summary file here, so that when</div><div class='del'>-                   the group is opened we'll know we need to build it. */</div><div class='del'>-		gchar *summary_file;</div><div class='del'>-		int fd;</div><div class='del'>-		summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);</div><div class='del'>-		</div><div class='del'>-		fd = open (summary_file, O_CREAT | O_RDWR, 0666);</div><div class='del'>-		close (fd);</div><div class='del'>-</div><div class='del'>-		g_free (summary_file);</div><div class='del'>-	}</div><div class='del'>-	if (ret) g_free (ret);</div><div class='del'>-</div><div class='del'>-	g_free (root_dir);</div><div class='del'>-	camel_exception_free (ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_store_unsubscribe_group (CamelStore *store,</div><div class='del'>-				    const gchar *group_name)</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 *summary_file;</div><div class='del'>-</div><div class='del'>-	summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);</div><div class='del'>-	if (g_file_exists (summary_file))</div><div class='del'>-		unlink (summary_file);</div><div class='del'>-	g_free (summary_file);</div><div class='del'>-</div><div class='del'>-	g_free (root_dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-camel_nntp_store_list_subscribed_groups(CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	GList *group_name_list = NULL;</div><div class='del'>-	struct stat stat_buf;</div><div class='del'>-	gint stat_error = 0;</div><div class='del'>-	gchar *entry_name;</div><div class='del'>-	gchar *full_entry_name;</div><div class='del'>-	gchar *real_group_name;</div><div class='del'>-	struct dirent *dir_entry;</div><div class='del'>-	DIR *dir_handle;</div><div class='del'>-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));</div><div class='del'>-</div><div class='del'>-	dir_handle = opendir (root_dir);</div><div class='del'>-	g_return_val_if_fail (dir_handle, NULL);</div><div class='del'>-</div><div class='del'>-	/* read the first entry in the directory */</div><div class='del'>-	dir_entry = readdir (dir_handle);</div><div class='del'>-	while ((stat_error != -1) &amp;&amp; (dir_entry != NULL)) {</div><div class='del'>-</div><div class='del'>-		/* get the name of the next entry in the dir */</div><div class='del'>-		entry_name = dir_entry-&gt;d_name;</div><div class='del'>-		full_entry_name = g_strdup_printf ("%s/%s", root_dir, entry_name);</div><div class='del'>-		stat_error = stat (full_entry_name, &amp;stat_buf);</div><div class='del'>-		g_free (full_entry_name);</div><div class='del'>-</div><div class='del'>-		/* is it a normal file ending in -ev-summary ? */</div><div class='del'>-		if ((stat_error != -1) &amp;&amp; S_ISREG (stat_buf.st_mode)) {</div><div class='del'>-			gboolean summary_suffix_found;</div><div class='del'>-</div><div class='del'>-			real_group_name = string_prefix (entry_name, "-ev-summary",</div><div class='del'>-							 &amp;summary_suffix_found);</div><div class='del'>-</div><div class='del'>-			if (summary_suffix_found)</div><div class='del'>-				/* add the folder name to the list */</div><div class='del'>-				group_name_list = g_list_append (group_name_list, </div><div class='del'>-								 real_group_name);</div><div class='del'>-		}</div><div class='del'>-		/* read next entry */</div><div class='del'>-		dir_entry = readdir (dir_handle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir_handle);</div><div class='del'>-</div><div class='del'>-	return group_name_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	char *news_dir;</div><div class='del'>-	char *top_dir;</div><div class='del'>-</div><div class='del'>-	g_assert(url != NULL);</div><div class='del'>-</div><div class='del'>-	news_dir = gnome_util_prepend_user_home ("evolution/news");</div><div class='del'>-</div><div class='del'>-	top_dir = g_strdup_printf( "%s/%s",</div><div class='del'>-				   news_dir,</div><div class='del'>-				   url-&gt;host );</div><div class='del'>-</div><div class='del'>-	g_free (news_dir);</div><div class='del'>-</div><div class='del'>-	return top_dir;</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 9d4d6edebc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 Helix Code, Inc. &lt;toshok@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 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'>-</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 &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-nntp-newsrc.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)     (GTK_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore))</div><div class='del'>-#define CAMEL_NNTP_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass))</div><div class='del'>-#define IS_CAMEL_NNTP_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_NNTP_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'>-#define CAMEL_NNTP_EXT_XOVER 0x01</div><div class='del'>-	guint32 extensions;</div><div class='del'>-</div><div class='del'>-	CamelNNTPNewsrc *newsrc;</div><div class='del'>-</div><div class='del'>-	CamelStream *istream, *ostream;</div><div class='del'>-} CamelNNTPStore;</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'>-} CamelNNTPStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void camel_nntp_store_open (CamelNNTPStore *store, CamelException *ex);</div><div class='del'>-void camel_nntp_store_close (CamelNNTPStore *store, gboolean expunge,</div><div class='del'>-			     CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_nntp_store_subscribe_group (CamelStore *store, const gchar *group_name);</div><div class='del'>-void camel_nntp_store_unsubscribe_group (CamelStore *store, const gchar *group_name);</div><div class='del'>-GList *camel_nntp_store_list_subscribed_groups(CamelStore *store);</div><div class='del'>-</div><div class='del'>-gchar *camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store);</div><div class='del'>-</div><div class='del'>-/* support functions */</div><div class='del'>-enum { CAMEL_NNTP_OK, CAMEL_NNTP_ERR, CAMEL_NNTP_FAIL };</div><div class='del'>-int camel_nntp_command (CamelNNTPStore *store, char **ret, char *fmt, ...);</div><div class='del'>-char *camel_nntp_command_get_additional_data (CamelNNTPStore *store);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType camel_nntp_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_NNTP_STORE_H */</div><div class='del'>-</div><div class='del'>-</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 ae1f676cc3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-utils.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'>-/* 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@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code .</div><div class='del'>- *</div><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'>-#include "camel-folder-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-utils.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-stream-mem.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'>-</div><div class='del'>-	status = camel_nntp_command (nntp_store, 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 == CAMEL_NNTP_OK) {</div><div class='del'>-		CamelStream *nntp_istream = nntp_store-&gt;istream;</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'>-			line = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER ( nntp_istream ));</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'>-				CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);</div><div class='del'>-				char **split_line = g_strsplit (line, "\t", 7);</div><div class='del'>-</div><div class='del'>-				new_info-&gt;subject = g_strdup(split_line[1]);</div><div class='del'>-				new_info-&gt;from = g_strdup(split_line[2]);</div><div class='del'>-				new_info-&gt;to = g_strdup(nntp_folder-&gt;group_name);</div><div class='del'>-				new_info-&gt;date_sent = header_decode_date(split_line[3], 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(split_line[3]);</div><div class='del'>-#endif</div><div class='del'>-				new_info-&gt;size = atoi(split_line[5]);</div><div class='del'>-				new_info-&gt;uid = g_strdup(split_line[4]);</div><div class='del'>-				g_strfreev (split_line);</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'>-			g_free (line);</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'>-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, NULL,</div><div class='del'>-					     "HEAD %d", i);</div><div class='del'>-</div><div class='del'>-		if (status == CAMEL_NNTP_OK) {</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 = 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 = 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(header-&gt;value);</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'>-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;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	status = camel_nntp_command (nntp_store, &amp;ret,</div><div class='del'>-				     "GROUP %s", CAMEL_NNTP_FOLDER (folder)-&gt;group_name);</div><div class='del'>-</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'>-	if (status != CAMEL_NNTP_OK) {</div><div class='del'>-		/* XXX throw invalid group exception */</div><div class='del'>-		printf ("invalid group\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (nntp_store-&gt;extensions &amp; CAMEL_NNTP_EXT_XOVER) {</div><div class='del'>-#endif</div><div class='del'>-		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);</div><div class='del'>-#if 0</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		get_HEAD_headers (nntp_store, folder, first_message, last_message, ex);</div><div class='del'>-	}</div><div class='del'>-#endif</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 f28697c744..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/nntp/camel-nntp-utils.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-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@helixcode.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Helix Code .</div><div class='del'>- *</div><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'>-</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 7d926a5545..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +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='head'>diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am<br/>deleted file mode 100644<br/>index 1c15981411..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelpop3includedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelpop3.la</div><div class='del'>-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'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	$(KRB4_CFLAGS)				\</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-folder.c			\</div><div class='del'>-	camel-pop3-provider.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-folder.h			\</div><div class='del'>-	camel-pop3-store.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelpop3.urls</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 9a2d982fcd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/camel-pop3-folder.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-#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'>-</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 CF_CLASS(o) (CAMEL_FOLDER_CLASS (GTK_OBJECT (o)-&gt;klass))</div><div class='del'>-static CamelFolderClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void pop3_sync (CamelFolder *folder, gboolean expunge,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static gint get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static GPtrArray *get_uids (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void free_uids (CamelFolder *folder, GPtrArray *uids);</div><div class='del'>-static CamelMimeMessage *get_message_by_uid (CamelFolder *folder, </div><div class='del'>-					     const char *uid,</div><div class='del'>-					     CamelException *ex);</div><div class='del'>-static void delete_message_by_uid (CamelFolder *folder, const char *uid,</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_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'>-	GtkObjectClass *object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_pop3_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (camel_folder_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</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 = get_message_count;</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'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_by_uid = get_message_by_uid;</div><div class='del'>-	camel_folder_class-&gt;delete_message_by_uid = delete_message_by_uid;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = finalize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_folder_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = FALSE;</div><div class='del'>-	folder-&gt;has_summary_capability = FALSE;</div><div class='del'>-	folder-&gt;has_search_capability = FALSE;</div><div class='del'>-</div><div class='del'>-	pop3_folder-&gt;uids = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_pop3_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_pop3_folder_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_pop3_folder_type) {</div><div class='del'>-		GtkTypeInfo camel_pop3_folder_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelPop3Folder",</div><div class='del'>-			sizeof (CamelPop3Folder),</div><div class='del'>-			sizeof (CamelPop3FolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_pop3_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_pop3_folder_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'>-		camel_pop3_folder_type = gtk_type_unique (CAMEL_FOLDER_TYPE, &amp;camel_pop3_folder_info);</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'>-</div><div class='del'>-void</div><div class='del'>-finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);</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'>-		CAMEL_FOLDER (gtk_object_new (camel_pop3_folder_get_type (),</div><div class='del'>-					      NULL));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;init (folder, parent, NULL, "inbox", "/", TRUE, ex);</div><div class='del'>-	return folder;</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'>-	if (expunge)</div><div class='del'>-		camel_pop3_store_expunge (CAMEL_POP3_STORE (folder-&gt;parent_store), ex);</div><div class='del'>-}</div><div class='del'>-				</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-parse_listing (int count, char *data)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *ans;</div><div class='del'>-	char *p;</div><div class='del'>-	int index, len;</div><div class='del'>-</div><div class='del'>-	ans = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (ans, count);</div><div class='del'>-</div><div class='del'>-	p = data;</div><div class='del'>-	while (*p) {</div><div class='del'>-		index = strtoul (p, &amp;p, 10);</div><div class='del'>-		len = strcspn (p, "\n");</div><div class='del'>-		if (index &lt;= count &amp;&amp; *p == ' ')</div><div class='del'>-			ans-&gt;pdata[index - 1] = g_strndup (p + 1, len - 1);</div><div class='del'>-		p += len;</div><div class='del'>-		if (*p == '\n')</div><div class='del'>-			p++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (index = 0; index &lt; count; index++) {</div><div class='del'>-		if (ans-&gt;pdata[index] == NULL) {</div><div class='del'>-			g_ptr_array_free (ans, TRUE);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ans;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-uid_to_number (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!get_uids (folder, ex))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pop3_folder-&gt;uids-&gt;len; i++) {</div><div class='del'>-		if (!strcmp (uid, pop3_folder-&gt;uids-&gt;pdata[i]))</div><div class='del'>-			return i + 1;</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 CamelMimeMessage *</div><div class='del'>-get_message_by_uid (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int status, num;</div><div class='del'>-	char *result, *body;</div><div class='del'>-	CamelStream *msgstream;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-</div><div class='del'>-	num = uid_to_number (folder, uid, ex);</div><div class='del'>-	if (num == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	status = camel_pop3_command (CAMEL_POP3_STORE (folder-&gt;parent_store),</div><div class='del'>-				     &amp;result, "RETR %d", num);</div><div class='del'>-	if (status != CAMEL_POP3_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not retrieve message from POP "</div><div class='del'>-				      "server %s: %s.", service-&gt;url-&gt;host,</div><div class='del'>-				      status == CAMEL_POP3_ERR ? result :</div><div class='del'>-				      "Unknown error");</div><div class='del'>-		g_free (result);</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'>-	body = camel_pop3_command_get_additional_data (CAMEL_POP3_STORE (folder-&gt;parent_store), ex);</div><div class='del'>-	if (!body) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not retrieve message from POP "</div><div class='del'>-				      "server %s: %s", service-&gt;url-&gt;host,</div><div class='del'>-				      camel_exception_get_description (ex));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msgstream = camel_stream_mem_new_with_buffer (body, strlen (body));</div><div class='del'>-	g_free (body);</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), CAMEL_STREAM (msgstream));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (msgstream));</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'>-delete_message_by_uid (CamelFolder *folder, const char *uid,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int status, num;</div><div class='del'>-	char *resp;</div><div class='del'>-</div><div class='del'>-	num = uid_to_number (folder, uid, ex);</div><div class='del'>-	if (num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	status = camel_pop3_command (CAMEL_POP3_STORE (folder-&gt;parent_store),</div><div class='del'>-				     &amp;resp, "DELE %d", num);</div><div class='del'>-	if (status != CAMEL_POP3_OK) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				      "Unable to delete message %s%s%s",</div><div class='del'>-				      uid, resp ? ": " : "",</div><div class='del'>-				      resp ? resp : "");</div><div class='del'>-	}</div><div class='del'>-	g_free (resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	if (!get_uids (folder, ex))</div><div class='del'>-		return -1;</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'>-get_uids (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 = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	int count, status;</div><div class='del'>-	char *data;</div><div class='del'>-</div><div class='del'>-	if (pop3_folder-&gt;uids)</div><div class='del'>-		return pop3_folder-&gt;uids;</div><div class='del'>-</div><div class='del'>-	status = camel_pop3_command (pop3_store, &amp;data, "STAT");</div><div class='del'>-	if (status != CAMEL_POP3_OK) {</div><div class='del'>-		CamelService *service = CAMEL_SERVICE (folder-&gt;parent_store);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not get message count from POP "</div><div class='del'>-				      "server %s: %s.", service-&gt;url-&gt;host,</div><div class='del'>-				      data ? data : "Unknown error");</div><div class='del'>-		g_free (data);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = atoi (data);</div><div class='del'>-	g_free (data);</div><div class='del'>-</div><div class='del'>-	if (pop3_store-&gt;supports_uidl != FALSE) {</div><div class='del'>-		status = camel_pop3_command (pop3_store, NULL, "UIDL");</div><div class='del'>-		if (status != CAMEL_POP3_OK)</div><div class='del'>-			pop3_store-&gt;supports_uidl = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pop3_store-&gt;supports_uidl == FALSE) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		pop3_folder-&gt;uids = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_set_size (pop3_folder-&gt;uids, count);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			pop3_folder-&gt;uids-&gt;pdata[i] =</div><div class='del'>-				g_strdup_printf ("%d", i + 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return pop3_folder-&gt;uids;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = camel_pop3_command_get_additional_data (pop3_store, 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'>-	pop3_folder-&gt;uids = parse_listing (count, data);</div><div class='del'>-	g_free (data);</div><div class='del'>-</div><div class='del'>-	if (!pop3_folder-&gt;uids) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "UID listing from server was "</div><div class='del'>-				      "incomplete.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pop3_folder-&gt;uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uids (CamelFolder *folder, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	;</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 874c7a3a04..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/camel-pop3-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-pop3-folder.h : Class for a POP3 folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author:</div><div class='del'>- *   Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-</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 &lt;gtk/gtk.h&gt;</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)     (GTK_CHECK_CAST((obj), CAMEL_POP3_FOLDER_TYPE, CamelPop3Folder))</div><div class='del'>-#define CAMEL_POP3_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_POP3_FOLDER_TYPE, CamelPop3FolderClass))</div><div class='del'>-#define IS_CAMEL_POP3_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_POP3_FOLDER_TYPE))</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 Gtk function */</div><div class='del'>-GtkType 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 4ccb06058f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/camel-pop3-provider.c</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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-#include "config.h"</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'>-</div><div class='del'>-static CamelProvider pop3_provider = {</div><div class='del'>-	"pop",</div><div class='del'>-	"POP",</div><div class='del'>-</div><div class='del'>-	"For connecting to POP servers. The POP protocol can also be used "</div><div class='del'>-	"to retrieve mail from certain web mail providers and proprietary "</div><div class='del'>-	"email systems.",</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-</div><div class='del'>-	NULL</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'>-	pop3_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_pop3_store_get_type();</div><div class='del'>-</div><div class='del'>-	pop3_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);</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 ba2b9857ac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/camel-pop3-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,682 +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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-#include "config.h"</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-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-stream-fs.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 "md5-utils.h"</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'>-#ifdef HAVE_KRB4</div><div class='del'>-/* Specified nowhere */</div><div class='del'>-#define KPOP_PORT 1109</div><div class='del'>-</div><div class='del'>-#include &lt;krb.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static CamelServiceClass *service_class = NULL;</div><div class='del'>-</div><div class='del'>-static void finalize (GtkObject *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, CamelException *ex);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static void free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, </div><div class='del'>-				gboolean create, CamelException *ex);</div><div class='del'>-static char *get_folder_name (CamelStore *store, const char *folder_name, </div><div class='del'>-			      CamelException *ex);</div><div class='del'>-static char *get_root_folder_name (CamelStore *store, CamelException *ex);</div><div class='del'>-</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'>-	GtkObjectClass *object_class =</div><div class='del'>-		GTK_OBJECT_CLASS (camel_pop3_store_class);</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'>-	service_class = gtk_type_class (camel_service_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	object_class-&gt;finalize = finalize;</div><div class='del'>-</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'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	camel_service_class-&gt;free_auth_types = free_auth_types;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_name = get_folder_name;</div><div class='del'>-	camel_store_class-&gt;get_root_folder_name = get_root_folder_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'>-camel_pop3_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-</div><div class='del'>-	service-&gt;url_flags = ( CAMEL_SERVICE_URL_NEED_USER |</div><div class='del'>-			       CAMEL_SERVICE_URL_NEED_HOST );</div><div class='del'>-}</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'>-camel_pop3_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_pop3_store_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_pop3_store_type) {</div><div class='del'>-		GtkTypeInfo camel_pop3_store_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelPop3Store",</div><div class='del'>-			sizeof (CamelPop3Store),</div><div class='del'>-			sizeof (CamelPop3StoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_pop3_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_pop3_store_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'>-		camel_pop3_store_type = gtk_type_unique (CAMEL_STORE_TYPE, &amp;camel_pop3_store_info);</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 (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (object);</div><div class='del'>-	CamelException ex;</div><div class='del'>-</div><div class='del'>-	camel_exception_init (&amp;ex);</div><div class='del'>-	pop3_disconnect (CAMEL_SERVICE (object), &amp;ex);</div><div class='del'>-	camel_exception_clear (&amp;ex);</div><div class='del'>-</div><div class='del'>-	if (pop3_store-&gt;apop_timestamp)</div><div class='del'>-		g_free (pop3_store-&gt;apop_timestamp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	"Password",</div><div class='del'>-</div><div class='del'>-	"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'>-static CamelServiceAuthType apop_authtype = {</div><div class='del'>-	"APOP",</div><div class='del'>-</div><div class='del'>-	"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'>-#ifdef HAVE_KRB4</div><div class='del'>-static CamelServiceAuthType kpop_authtype = {</div><div class='del'>-	"Kerberos 4 (KPOP)",</div><div class='del'>-</div><div class='del'>-	"This will connect to the POP server and use Kerberos 4 "</div><div class='del'>-	"to authenticate to it.",</div><div class='del'>-</div><div class='del'>-	"+KPOP",</div><div class='del'>-	FALSE</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server (CamelService *service, gboolean real, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Store *store = CAMEL_POP3_STORE (service);</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	int fd, status;</div><div class='del'>-	char *buf, *apoptime, *apopend;</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	gboolean kpop = (service-&gt;url-&gt;port == KPOP_PORT);</div><div class='del'>-#endif</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'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	if (service-&gt;url-&gt;port)</div><div class='del'>-		sin.sin_port = htons (service-&gt;url-&gt;port);</div><div class='del'>-	else</div><div class='del'>-		sin.sin_port = htons (POP3_PORT);</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'>-	if (fd == -1 ||</div><div class='del'>-	    connect (fd, (struct sockaddr *)&amp;sin, sizeof(sin)) == -1) {</div><div class='del'>-		if (real) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      "Could not connect to %s: %s",</div><div class='del'>-					      h-&gt;h_name, g_strerror(errno));</div><div class='del'>-		}</div><div class='del'>-		if (fd &gt; -1)</div><div class='del'>-			close (fd);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	if (kpop) {</div><div class='del'>-		KTEXT_ST ticket_st;</div><div class='del'>-		MSG_DAT msg_data;</div><div class='del'>-		CREDENTIALS cred;</div><div class='del'>-		Key_schedule schedule;</div><div class='del'>-		char *hostname;</div><div class='del'>-</div><div class='del'>-		/* Need to copy hostname, because krb_realmofhost will</div><div class='del'>-		 * call gethostbyname as well, and gethostbyname uses</div><div class='del'>-		 * static storage.</div><div class='del'>-		 */</div><div class='del'>-		hostname = g_strdup (h-&gt;h_name);</div><div class='del'>-		status = krb_sendauth (0, fd, &amp;ticket_st, "pop", hostname,</div><div class='del'>-				       krb_realmofhost (hostname), 0,</div><div class='del'>-				       &amp;msg_data, &amp;cred, schedule,</div><div class='del'>-				       NULL, NULL, "KPOPV0.1");</div><div class='del'>-		g_free (hostname);</div><div class='del'>-		if (status != KSUCCESS) {</div><div class='del'>-			if (real) {</div><div class='del'>-				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-						      "Could not authenticate "</div><div class='del'>-						      "to KPOP server: %s",</div><div class='del'>-						      krb_err_txt[status]);</div><div class='del'>-			}</div><div class='del'>-			close (fd);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!service-&gt;url-&gt;passwd)</div><div class='del'>-			service-&gt;url-&gt;passwd = g_strdup (service-&gt;url-&gt;user);</div><div class='del'>-	}</div><div class='del'>-#endif /* HAVE_KRB4 */</div><div class='del'>-</div><div class='del'>-	store-&gt;ostream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	store-&gt;istream = camel_stream_buffer_new (store-&gt;ostream,</div><div class='del'>-						  CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-</div><div class='del'>-	/* Read the greeting, note APOP timestamp, if any. */</div><div class='del'>-	buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store-&gt;istream));</div><div class='del'>-	if (!buf) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not read greeting from POP "</div><div class='del'>-				      "server: %s",</div><div class='del'>-				      camel_exception_get_description (ex));</div><div class='del'>-		pop3_disconnect (service, ex);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	apoptime = strchr (buf, '&lt;');</div><div class='del'>-	apopend = apoptime ? strchr (apoptime, '&gt;') : NULL;</div><div class='del'>-	if (apopend) {</div><div class='del'>-		store-&gt;apop_timestamp = g_strndup (apoptime,</div><div class='del'>-						   apopend - apoptime + 1);</div><div class='del'>-		memmove (apoptime, apopend + 1, strlen (apopend + 1));</div><div class='del'>-	}</div><div class='del'>-	store-&gt;implementation = buf;</div><div class='del'>-</div><div class='del'>-	/* Check extensions */</div><div class='del'>-	store-&gt;login_delay = -1;</div><div class='del'>-	store-&gt;supports_top = -1;</div><div class='del'>-	store-&gt;supports_uidl = -1;</div><div class='del'>-	store-&gt;expires = -1;</div><div class='del'>-</div><div class='del'>-	status = camel_pop3_command (store, NULL, "CAPA");</div><div class='del'>-	if (status == CAMEL_POP3_OK) {</div><div class='del'>-		char *p;</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		buf = camel_pop3_command_get_additional_data (store, ex);</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			pop3_disconnect (service, ex);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		p = buf;</div><div class='del'>-		while (*p) {</div><div class='del'>-			len = strcspn (p, "\n");</div><div class='del'>-			if (!strncmp (p, "IMPLEMENTATION ", 15)) {</div><div class='del'>-				store-&gt;implementation =</div><div class='del'>-					g_strndup (p + 15, len - 15);</div><div class='del'>-			} else if (!strncmp (p, "TOP", len))</div><div class='del'>-				store-&gt;supports_top = TRUE;</div><div class='del'>-			else if (!strncmp (p, "UIDL", len))</div><div class='del'>-				store-&gt;supports_uidl = TRUE;</div><div class='del'>-			else if (!strncmp (p, "LOGIN-DELAY ", 12))</div><div class='del'>-				store-&gt;login_delay = atoi (p + 12);</div><div class='del'>-			else if (!strncmp (p, "EXPIRE NEVER", 12))</div><div class='del'>-				store-&gt;expires = FALSE;</div><div class='del'>-			else if (!strncmp (p, "EXPIRE ", 7))</div><div class='del'>-				store-&gt;expires = TRUE;</div><div class='del'>-</div><div class='del'>-			p += len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (buf);</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 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 *ret = NULL;</div><div class='del'>-	gboolean passwd = TRUE, apop = TRUE;</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	gboolean kpop = TRUE;</div><div class='del'>-	int saved_port;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url &amp;&amp; !service-&gt;url-&gt;empty) {</div><div class='del'>-		passwd = connect_to_server (service, FALSE, ex);</div><div class='del'>-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)</div><div class='del'>-			return NULL;</div><div class='del'>-		apop = store-&gt;apop_timestamp != NULL;</div><div class='del'>-		if (passwd)</div><div class='del'>-			pop3_disconnect (service, ex);</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-		saved_port = service-&gt;url-&gt;port;</div><div class='del'>-		service-&gt;url-&gt;port = KPOP_PORT;</div><div class='del'>-		kpop = connect_to_server (service, FALSE, ex);</div><div class='del'>-		service-&gt;url-&gt;port = saved_port;</div><div class='del'>-		if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)</div><div class='del'>-			return NULL;</div><div class='del'>-		if (kpop)</div><div class='del'>-			pop3_disconnect (service, ex);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (passwd)</div><div class='del'>-		ret = g_list_append (ret, &amp;password_authtype);</div><div class='del'>-	if (apop)</div><div class='del'>-		ret = g_list_append (ret, &amp;apop_authtype);</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	if (kpop)</div><div class='del'>-		ret = g_list_append (ret, &amp;kpop_authtype);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!ret) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not connect to POP server on "</div><div class='del'>-				      "%s.", service-&gt;url-&gt;host);</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'>-free_auth_types (CamelService *service, GList *authtypes)</div><div class='del'>-{</div><div class='del'>-	g_list_free (authtypes);</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'>-	camel_pop3_command (store, NULL, "QUIT");</div><div class='del'>-	pop3_disconnect (CAMEL_SERVICE (store), ex);</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'>-	CamelPop3Store *store = CAMEL_POP3_STORE (service);</div><div class='del'>-	int status;</div><div class='del'>-	char *msg;</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	gboolean kpop = (service-&gt;url-&gt;authmech &amp;&amp;</div><div class='del'>-			 !strcmp (service-&gt;url-&gt;authmech, "+KPOP"));</div><div class='del'>-</div><div class='del'>-	if (kpop &amp;&amp; service-&gt;url-&gt;port == 0)</div><div class='del'>-		service-&gt;url-&gt;port = KPOP_PORT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!connect_to_server (service, TRUE, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* The KPOP code will have set the password to be the username</div><div class='del'>-	 * in connect_to_server. Password and APOP are the only other</div><div class='del'>-	 * cases, and they both need a password.</div><div class='del'>-	 */</div><div class='del'>-	if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-		char *prompt = g_strdup_printf ("Please enter the POP3 password for %s@%s",</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_query_authenticator (</div><div class='del'>-			camel_service_get_session (service),</div><div class='del'>-			CAMEL_AUTHENTICATOR_ASK, prompt, TRUE,</div><div class='del'>-			service, "password", ex);</div><div class='del'>-		g_free (prompt);</div><div class='del'>-		if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-			pop3_disconnect (service, ex);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!service-&gt;url-&gt;authmech ||</div><div class='del'>-	    !strcmp (service-&gt;url-&gt;authmech, "+KPOP")) {</div><div class='del'>-		status = camel_pop3_command (store, &amp;msg, "USER %s",</div><div class='del'>-					     service-&gt;url-&gt;user);</div><div class='del'>-		if (status != CAMEL_POP3_OK) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      "Unable to connect to POP "</div><div class='del'>-					      "server. Error sending username:"</div><div class='del'>-					      " %s", msg ? msg : "(Unknown)");</div><div class='del'>-			g_free (msg);</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		g_free (msg);</div><div class='del'>-</div><div class='del'>-		status = camel_pop3_command (store, &amp;msg, "PASS %s",</div><div class='del'>-					     service-&gt;url-&gt;passwd);</div><div class='del'>-	} else if (!strcmp (service-&gt;url-&gt;authmech, "+APOP")</div><div class='del'>-		   &amp;&amp; store-&gt;apop_timestamp) {</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 = g_strdup_printf ("%s%s", store-&gt;apop_timestamp,</div><div class='del'>-					  service-&gt;url-&gt;passwd);</div><div class='del'>-		md5_get_digest (secret, strlen (secret), md5sum);</div><div class='del'>-		g_free (secret);</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'>-		status = camel_pop3_command (store, &amp;msg, "APOP %s %s",</div><div class='del'>-					     service-&gt;url-&gt;user, md5asc);</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     "No support for requested "</div><div class='del'>-				     "authentication mechanism.");</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status != CAMEL_POP3_OK) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      "Unable to authenticate to POP "</div><div class='del'>-				      "server. Error sending password:"</div><div class='del'>-				      " %s", msg ? msg : "(Unknown)");</div><div class='del'>-		g_free (msg);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	g_free (msg);</div><div class='del'>-</div><div class='del'>-	service_class-&gt;connect (service, ex);</div><div class='del'>-	return TRUE;</div><div class='del'>-</div><div class='del'>- lose:</div><div class='del'>-	/* Uncache the password. */</div><div class='del'>-	camel_session_query_authenticator (camel_service_get_session (service),</div><div class='del'>-					   CAMEL_AUTHENTICATOR_TELL, NULL,</div><div class='del'>-					   TRUE, service, "password", ex);</div><div class='del'>-</div><div class='del'>-	pop3_disconnect (service, ex);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_disconnect (CamelService *service, 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 (!service_class-&gt;disconnect (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (store-&gt;ostream) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (store-&gt;ostream));</div><div class='del'>-		store-&gt;ostream = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (store-&gt;istream) {</div><div class='del'>-		gtk_object_unref (GTK_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;apop_timestamp) {</div><div class='del'>-		g_free (store-&gt;apop_timestamp);</div><div class='del'>-		store-&gt;apop_timestamp = 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 CamelFolder *</div><div class='del'>-get_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-	    gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (store);</div><div class='del'>-</div><div class='del'>-	if (!camel_service_is_connected (service)) {</div><div class='del'>-		if (!camel_service_connect (service, ex))</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 char *</div><div class='del'>-get_folder_name (CamelStore *store, const char *folder_name,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (!g_strcasecmp (folder_name, "inbox"))</div><div class='del'>-		return g_strdup ("inbox");</div><div class='del'>-	else {</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'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_root_folder_name (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("inbox");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pop3_command: Send a command to a POP3 server.</div><div class='del'>- * @store: the POP3 store</div><div class='del'>- * @ret: a pointer to return the full server response in</div><div class='del'>- * @fmt: a printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This command sends the command specified by @fmt and the following</div><div class='del'>- * arguments to the connected POP3 store specified by @store. It then</div><div class='del'>- * reads the server's response and parses out the status code. If</div><div class='del'>- * the caller passed a non-NULL pointer for @ret, camel_pop3_command</div><div class='del'>- * will set it to point to an buffer containing the rest of the</div><div class='del'>- * response from the POP3 server. (If @ret was passed but there was</div><div class='del'>- * no extended response, @ret will be set to NULL.) The caller must</div><div class='del'>- * free this buffer when it is done with it.</div><div class='del'>- *</div><div class='del'>- * Return value: one of CAMEL_POP3_OK (command executed successfully),</div><div class='del'>- * CAMEL_POP3_ERR (command encounted an error), or CAMEL_POP3_FAIL</div><div class='del'>- * (a protocol-level error occurred, and Camel is uncertain of the</div><div class='del'>- * result of the command.)</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_pop3_command (CamelPop3Store *store, char **ret, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (store);</div><div class='del'>-	char *cmdbuf, *respbuf;</div><div class='del'>-	va_list ap;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	if (!store-&gt;ostream) {</div><div class='del'>-		CamelException ex;</div><div class='del'>-</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		if (!camel_service_connect (service, &amp;ex)) {</div><div class='del'>-			if (ret)</div><div class='del'>-				*ret = g_strdup (camel_exception_get_description (&amp;ex));</div><div class='del'>-			camel_exception_clear (&amp;ex);</div><div class='del'>-			return CAMEL_POP3_FAIL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	cmdbuf = g_strdup_vprintf (fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-</div><div class='del'>-	/* Send the command */</div><div class='del'>-	if (camel_stream_printf (store-&gt;ostream, "%s\r\n", cmdbuf) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		if (*ret)</div><div class='del'>-			*ret = g_strdup(strerror(errno));</div><div class='del'>-		return CAMEL_POP3_FAIL;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-</div><div class='del'>-	/* Read the response */</div><div class='del'>-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store-&gt;istream));</div><div class='del'>-	if (respbuf == NULL) {</div><div class='del'>-		if (*ret)</div><div class='del'>-			*ret = g_strdup(strerror(errno));</div><div class='del'>-		return CAMEL_POP3_FAIL;</div><div class='del'>-	}</div><div class='del'>-	if (!strncmp (respbuf, "+OK", 3))</div><div class='del'>-		status = CAMEL_POP3_OK;</div><div class='del'>-	else if (!strncmp (respbuf, "-ERR", 4))</div><div class='del'>-		status = CAMEL_POP3_ERR;</div><div class='del'>-	else</div><div class='del'>-		status = CAMEL_POP3_FAIL;</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		if (status != CAMEL_POP3_FAIL) {</div><div class='del'>-			*ret = strchr (respbuf, ' ');</div><div class='del'>-			if (*ret)</div><div class='del'>-				*ret = g_strdup (*ret + 1);</div><div class='del'>-		} else</div><div class='del'>-			*ret = NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free (respbuf);</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'>- * camel_pop3_command_get_additional_data: get "additional data" from</div><div class='del'>- * a POP3 command.</div><div class='del'>- * @store: the POP3 store</div><div class='del'>- *</div><div class='del'>- * This command gets the additional data returned by "multi-line" POP</div><div class='del'>- * commands, such as LIST, RETR, TOP, and UIDL. This command _must_</div><div class='del'>- * be called after a successful (CAMEL_POP3_OK) call to</div><div class='del'>- * camel_pop3_command for a command that has a multi-line response.</div><div class='del'>- * The returned data is un-byte-stuffed, and has lines termined by</div><div class='del'>- * newlines rather than CR/LF pairs.</div><div class='del'>- *</div><div class='del'>- * Return value: the data, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_pop3_command_get_additional_data (CamelPop3Store *store,</div><div class='del'>-					CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store-&gt;istream);</div><div class='del'>-	GPtrArray *data;</div><div class='del'>-	char *buf, *p;</div><div class='del'>-	int i, len = 0, status = CAMEL_POP3_OK;</div><div class='del'>-</div><div class='del'>-	data = g_ptr_array_new ();</div><div class='del'>-	while (1) {</div><div class='del'>-		buf = camel_stream_buffer_read_line (stream);</div><div class='del'>-		if (!buf) {</div><div class='del'>-			status = CAMEL_POP3_FAIL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!strcmp (buf, "."))</div><div class='del'>-			break;</div><div class='del'>-		p = (*buf == '.') ? buf + 1 : buf;</div><div class='del'>-		g_ptr_array_add (data, p);</div><div class='del'>-		len += strlen (p) + 1;</div><div class='del'>-	}</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	if (status == CAMEL_POP3_OK) {</div><div class='del'>-		buf = g_malloc (len + 1);</div><div class='del'>-</div><div class='del'>-		for (i = 0, p = buf; i &lt; data-&gt;len; i++) {</div><div class='del'>-			len = strlen (data-&gt;pdata[i]);</div><div class='del'>-			memcpy (p, data-&gt;pdata[i], len);</div><div class='del'>-			p += len;</div><div class='del'>-			*p++ = '\n';</div><div class='del'>-		}</div><div class='del'>-		*p = '\0';</div><div class='del'>-	} else</div><div class='del'>-		buf = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; data-&gt;len; i++)</div><div class='del'>-		g_free (data-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (data, TRUE);</div><div class='del'>-</div><div class='del'>-	return buf;</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 74174a32f2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/pop3/camel-pop3-store.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-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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-</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;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-types.h"</div><div class='del'>-#include "camel-store.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)     (GTK_CHECK_CAST((obj), CAMEL_POP3_STORE_TYPE, CamelPop3Store))</div><div class='del'>-#define CAMEL_POP3_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_POP3_STORE_TYPE, CamelPop3StoreClass))</div><div class='del'>-#define IS_CAMEL_POP3_STORE(o)    (GTK_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'>-	CamelStream *istream, *ostream;</div><div class='del'>-	char *apop_timestamp, *implementation;</div><div class='del'>-	gboolean supports_top, supports_uidl, expires;</div><div class='del'>-	int login_delay;</div><div class='del'>-</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, char *fmt, ...);</div><div class='del'>-char *camel_pop3_command_get_additional_data (CamelPop3Store *store,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType 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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 cacc3c5d5f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/sendmail/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +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='head'>diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am<br/>deleted file mode 100644<br/>index 5df527435f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/sendmail/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelsendmailincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelsendmail.la</div><div class='del'>-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'>-	$(GTK_INCLUDEDIR) -I$(top_srcdir)/camel \</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 = -version-info 0:0:0</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 3b0b35dd72..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/sendmail/camel-sendmail-provider.c</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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-#include "config.h"</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'>-	"Sendmail",</div><div class='del'>-</div><div class='del'>-	"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,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-</div><div class='del'>-	NULL</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.service_cache = g_hash_table_new (camel_url_hash, 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 3b84d5cb90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-transport.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/sendmail/camel-sendmail-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,212 +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'>- * Author : </div><div class='del'>- *  Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.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;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 gboolean _can_send (CamelTransport *transport, CamelMedium *message);</div><div class='del'>-static gboolean _send (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-static gboolean _send_to (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-			  GList *recipients, 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'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_transport_class-&gt;can_send = _can_send;</div><div class='del'>-	camel_transport_class-&gt;send = _send;</div><div class='del'>-	camel_transport_class-&gt;send_to = _send_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_sendmail_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_sendmail_transport_type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!camel_sendmail_transport_type)	{</div><div class='del'>-		GtkTypeInfo camel_sendmail_transport_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelSendmailTransport",</div><div class='del'>-			sizeof (CamelSendmailTransport),</div><div class='del'>-			sizeof (CamelSendmailTransportClass),</div><div class='del'>-			(GtkClassInitFunc) camel_sendmail_transport_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</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'>-		camel_sendmail_transport_type = gtk_type_unique (CAMEL_TRANSPORT_TYPE, &amp;camel_sendmail_transport_info);</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'>-_can_send (CamelTransport *transport, CamelMedium *message)</div><div class='del'>-{</div><div class='del'>-	return CAMEL_IS_MIME_MESSAGE (message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_send_internal (CamelMedium *message, char **argv, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int 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'>-	g_assert (CAMEL_IS_MIME_MESSAGE (message));</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", g_strerror (errno));</div><div class='del'>-		sigprocmask (SIG_SETMASK, &amp;omask, NULL);</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, argv);</div><div class='del'>-		_exit (255);</div><div class='del'>-	}</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'>-		gtk_object_unref (GTK_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'>-	gtk_object_unref (GTK_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_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     "Could not execute "</div><div class='del'>-					     SENDMAIL_PATH ": mail not sent.");</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 gboolean</div><div class='del'>-_send_to (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-	  GList *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *r;</div><div class='del'>-	char **argv;</div><div class='del'>-	int i, len;</div><div class='del'>-	gboolean status;</div><div class='del'>-</div><div class='del'>-	len = g_list_length (recipients);</div><div class='del'>-	argv = g_malloc ((len + 4) * sizeof (char *));</div><div class='del'>-	argv[0] = "sendmail";</div><div class='del'>-	argv[1] = "-i";</div><div class='del'>-	argv[2] = "--";</div><div class='del'>-</div><div class='del'>-	for (i = 1, r = recipients; i &lt;= len; i++, r = r-&gt;next)</div><div class='del'>-		argv[i + 2] = r-&gt;data;</div><div class='del'>-	argv[i + 2] = NULL;</div><div class='del'>-</div><div class='del'>-	status = _send_internal (message, argv, ex);</div><div class='del'>-	g_free (argv);</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_send (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *argv[4] = { "sendmail", "-t", "-i", NULL };</div><div class='del'>-</div><div class='del'>-	return _send_internal (message, argv, ex);</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 3f3714584a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-transport.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/sendmail/camel-sendmail-transport.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'>-/* 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@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-</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)     (GTK_CHECK_CAST((obj), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransport))</div><div class='del'>-#define CAMEL_SENDMAIL_TRANSPORT_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransportClass))</div><div class='del'>-#define CAMEL_IS_SENDMAIL_TRANSPORT(o)    (GTK_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 Gtk function */</div><div class='del'>-GtkType 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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/smtp/.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/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am<br/>deleted file mode 100644<br/>index 32fa210131..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/smtp/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelsmtpincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelsmtp.la</div><div class='del'>-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'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-I$(top_srcdir)/camel			\</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 = -version-info 0:0:0</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 1d18e445cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/smtp/camel-smtp-provider.c</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'>-/* camel-smtp-provider.c: smtp provider registration code */</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 Helix Code, Inc. (www.helixcode.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 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'>-#include "config.h"</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'>-</div><div class='del'>-static CamelProvider smtp_provider = {</div><div class='del'>-	"smtp",</div><div class='del'>-	"SMTP",</div><div class='del'>-</div><div class='del'>-	"For delivering mail by connecting to a remote mailhub using SMTP.",</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	0,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-</div><div class='del'>-	NULL</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'>-</div><div class='del'>-	smtp_provider.service_cache = g_hash_table_new (camel_url_hash, 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 ed5f0416b3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-transport.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/smtp/camel-smtp-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,787 +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:</div><div class='del'>- *   Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc. (www.helixcode.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 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'>-#include "config.h"</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;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-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-stream-buffer.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-session.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'>-/* 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 _can_send (CamelTransport *transport, CamelMedium *message);</div><div class='del'>-static gboolean _send (CamelTransport *transport, CamelMedium *message, CamelException *ex);</div><div class='del'>-static gboolean _send_to (CamelTransport *transport, CamelMedium *message, GList *recipients, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* support prototypes */</div><div class='del'>-static gboolean smtp_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean smtp_disconnect (CamelService *service, CamelException *ex);</div><div class='del'>-static GList *esmtp_get_authtypes(gchar *buffer);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static void free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-static gchar *smtp_get_email_addr_from_text (gchar *text);</div><div class='del'>-static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-static gboolean smtp_mail (CamelSmtpTransport *transport, gchar *sender, CamelException *ex);</div><div class='del'>-static gboolean smtp_rcpt (CamelSmtpTransport *transport, gchar *recipient, CamelException *ex);</div><div class='del'>-static gboolean smtp_data (CamelSmtpTransport *transport, CamelMedium *message, 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'>-/* private data members */</div><div class='del'>-static CamelServiceClass *service_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'>-	service_class = gtk_type_class (camel_service_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</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;free_auth_types = free_auth_types;</div><div class='del'>-</div><div class='del'>-	camel_transport_class-&gt;can_send = _can_send;</div><div class='del'>-	camel_transport_class-&gt;send = _send;</div><div class='del'>-	camel_transport_class-&gt;send_to = _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, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-</div><div class='del'>-	service-&gt;url_flags = CAMEL_SERVICE_URL_NEED_HOST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-camel_smtp_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType camel_smtp_transport_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!camel_smtp_transport_type) {</div><div class='del'>-		GtkTypeInfo camel_smtp_transport_info =	</div><div class='del'>-		{</div><div class='del'>-			"CamelSmtpTransport",</div><div class='del'>-			sizeof (CamelSmtpTransport),</div><div class='del'>-			sizeof (CamelSmtpTransportClass),</div><div class='del'>-			(GtkClassInitFunc) camel_smtp_transport_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_smtp_transport_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'>-		camel_smtp_transport_type = gtk_type_unique (CAMEL_TRANSPORT_TYPE, &amp;camel_smtp_transport_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_smtp_transport_type;</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'>-	struct hostent *h;</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	gint fd, num, i;</div><div class='del'>-	guint32 addrlen;</div><div class='del'>-	gchar *pass = NULL, *respbuf = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!service_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;smtp_is_esmtp = FALSE;</div><div class='del'>-	transport-&gt;esmtp_supported_authtypes = NULL;</div><div class='del'>-</div><div class='del'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	sin.sin_port = htons (service-&gt;url-&gt;port ? service-&gt;url-&gt;port : SMTP_PORT);</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'>-	if (fd == -1 || connect (fd, (struct sockaddr *)&amp;sin, sizeof(sin)) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      "Could not connect to %s (port %s): %s",</div><div class='del'>-				      service-&gt;url-&gt;host, service-&gt;url-&gt;port,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		if (fd &gt; -1)</div><div class='del'>-			close (fd);</div><div class='del'>-		g_free (pass);</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'>-	addrlen = sizeof (transport-&gt;localaddr);</div><div class='del'>-	getsockname (fd, (struct sockaddr*)&amp;transport-&gt;localaddr, &amp;addrlen);</div><div class='del'>-</div><div class='del'>-	transport-&gt;ostream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	transport-&gt;istream = camel_stream_buffer_new (transport-&gt;ostream, </div><div class='del'>-						      CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-</div><div class='del'>-	/* Read the greeting, note whether the server is ESMTP and if it requests AUTH. */</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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "Welcome response error: "</div><div class='del'>-					      "%s: possibly non-fatal",</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if (strstr (respbuf, "ESMTP"))</div><div class='del'>-			transport-&gt;smtp_is_esmtp = TRUE;</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;smtp_is_esmtp) {</div><div class='del'>-		/* If we did not auto-detect ESMTP, we should still send EHLO */</div><div class='del'>-		transport-&gt;smtp_is_esmtp = TRUE;</div><div class='del'>-		if (!smtp_helo (transport, ex)) {</div><div class='del'>-			/* Okay, apprently this server doesn't support ESMTP */</div><div class='del'>-			transport-&gt;smtp_is_esmtp = FALSE;</div><div class='del'>-			smtp_helo (transport, ex);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		smtp_helo (transport, ex);</div><div class='del'>-	}</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 (transport-&gt;smtp_is_esmtp &amp;&amp; transport-&gt;esmtp_supported_authtypes) {</div><div class='del'>-		/* not really supported yet, but we can at least show what auth types are supported */</div><div class='del'>-		fprintf (stderr, "camel-smtp-transport::connect(): %s requires AUTH\n", service-&gt;url-&gt;host);</div><div class='del'>-		num = g_list_length (transport-&gt;esmtp_supported_authtypes);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; num; i++)</div><div class='del'>-			fprintf (stderr, "\nSupported AUTH: %s\n\n", </div><div class='del'>-				(gchar *) g_list_nth_data (transport-&gt;esmtp_supported_authtypes, i));</div><div class='del'>-</div><div class='del'>-		g_list_free (transport-&gt;esmtp_supported_authtypes);</div><div class='del'>-		transport-&gt;esmtp_supported_authtypes = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		fprintf (stderr, "\ncamel-smtp-transport::connect(): provider does not use AUTH\n\n");</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'>-smtp_disconnect (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'>-	if (!service-&gt;connected)</div><div class='del'>-		return TRUE;</div><div class='del'>-</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'>-	if (!service_class-&gt;disconnect (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_free (transport-&gt;esmtp_supported_authtypes);</div><div class='del'>-	transport-&gt;esmtp_supported_authtypes = NULL;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (transport-&gt;ostream));</div><div class='del'>-	gtk_object_unref (GTK_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'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList</div><div class='del'>-*esmtp_get_authtypes (gchar *buffer)</div><div class='del'>-{</div><div class='del'>-	GList *ret = NULL;</div><div class='del'>-	gchar *start, *end;</div><div class='del'>-</div><div class='del'>-	if (!(start = strstr (buffer, "AUTH")))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* advance to the first token */</div><div class='del'>-	for (start += 4; *start &amp;&amp; *start != ' ' &amp;&amp; *start != '='; start++);</div><div class='del'>-</div><div class='del'>-	for ( ; *start; ) {</div><div class='del'>-		/* advance to the end of the token */</div><div class='del'>-		for (end = start; *end &amp;&amp; *end != ' '; end++);</div><div class='del'>-</div><div class='del'>-		ret = g_list_append (ret, g_strndup (start, end - start));</div><div class='del'>-</div><div class='del'>-		/* advance to the next token */</div><div class='del'>-		for (start = end; *start &amp;&amp; *start != ' '; start++);</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 CamelServiceAuthType no_authtype = {</div><div class='del'>-	"No authentication required",</div><div class='del'>-</div><div class='del'>-	"This option will connect to the SMTP server without using any "</div><div class='del'>-	"kind of authentication. This should be fine for connecting to "</div><div class='del'>-	"most SMTP servers."</div><div class='del'>-</div><div class='del'>-	"",</div><div class='del'>-	FALSE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType cram_md5_authtype = {</div><div class='del'>-	"CRAM-MD5",</div><div class='del'>-</div><div class='del'>-	"This option will connect to the SMTP server using CRAM-MD5 "</div><div class='del'>-	"authentication.",</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 GList</div><div class='del'>-*query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: Re-enable this when auth types are actually</div><div class='del'>-	 * implemented.</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'>-free_auth_types (CamelService *service, GList *authtypes)</div><div class='del'>-{</div><div class='del'>-	g_list_free (authtypes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_can_send (CamelTransport *transport, CamelMedium *message)</div><div class='del'>-{</div><div class='del'>-	return CAMEL_IS_MIME_MESSAGE (message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_send_to (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-	  GList *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *r;</div><div class='del'>-	gchar *recipient, *s, *sender;</div><div class='del'>-	guint i, len;</div><div class='del'>-	CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport);</div><div class='del'>-</div><div class='del'>-	s = g_strdup(camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)));</div><div class='del'>-	if (!s) {</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 defined.");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sender = smtp_get_email_addr_from_text (s);</div><div class='del'>-	smtp_mail (smtp_transport, sender, ex);</div><div class='del'>-	g_free (sender);</div><div class='del'>-	g_free (s);</div><div class='del'>-</div><div class='del'>-	if (!(len = g_list_length(recipients))) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Cannot send message: "</div><div class='del'>-				      "no recipients defined.");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0, r = recipients; i &lt; len; i++, r = r-&gt;next) {</div><div class='del'>-		recipient = smtp_get_email_addr_from_text (r-&gt;data);</div><div class='del'>-		if (!smtp_rcpt (smtp_transport, recipient, ex)) {</div><div class='del'>-			g_free (recipient);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		g_free (recipient);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!smtp_data (smtp_transport, message, ex))</div><div class='del'>-		return FALSE;</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'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_send (CamelTransport *transport, CamelMedium *message,</div><div class='del'>-       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const CamelInternetAddress *to, *cc, *bcc;</div><div class='del'>-	GList *recipients = NULL;</div><div class='del'>-	guint index, len;</div><div class='del'>-</div><div class='del'>-	to = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_TO);</div><div class='del'>-	cc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_CC);</div><div class='del'>-	bcc = camel_mime_message_get_recipients (CAMEL_MIME_MESSAGE (message), CAMEL_RECIPIENT_TYPE_BCC);</div><div class='del'>-</div><div class='del'>-	/* get all of the To addresses into our recipient list */</div><div class='del'>-	len = CAMEL_ADDRESS (to)-&gt;addresses-&gt;len;</div><div class='del'>-	for (index = 0; index &lt; len; index++) {</div><div class='del'>-		const char *addr;</div><div class='del'>-</div><div class='del'>-		if (camel_internet_address_get (to, index, NULL, &amp;addr))</div><div class='del'>-			recipients = g_list_append (recipients, g_strdup (addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get all of the Cc addresses into our recipient list */</div><div class='del'>-	len = CAMEL_ADDRESS (cc)-&gt;addresses-&gt;len;</div><div class='del'>-	for (index = 0; index &lt; len; index++) {</div><div class='del'>-		const char *addr;</div><div class='del'>-</div><div class='del'>-		if (camel_internet_address_get (cc, index, NULL, &amp;addr))</div><div class='del'>-			recipients = g_list_append (recipients, g_strdup (addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get all of the Bcc addresses into our recipient list */</div><div class='del'>-	len = CAMEL_ADDRESS (bcc)-&gt;addresses-&gt;len;</div><div class='del'>-	for (index = 0; index &lt; len; index++) {</div><div class='del'>-		const char *addr;</div><div class='del'>-</div><div class='del'>-		if (camel_internet_address_get (bcc, index, NULL, &amp;addr))</div><div class='del'>-			recipients = g_list_append (recipients, g_strdup (addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return _send_to (transport, message, recipients, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar</div><div class='del'>-*smtp_get_email_addr_from_text (gchar *text)</div><div class='del'>-{</div><div class='del'>-	/* get the actual email address from the string passed and place it in addr</div><div class='del'>-	 * we can assume the address will be in one of the following forms:</div><div class='del'>-	 * 1) The Name &lt;person@host.com&gt;</div><div class='del'>-	 * 2) &lt;person@host.com&gt;</div><div class='del'>-	 * 3) person@host.com</div><div class='del'>-	 * 4) person@host.com (The Name)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gchar *tmp, *addr = NULL;</div><div class='del'>-	gchar *addr_strt;         /* points to start of addr */</div><div class='del'>-	gchar *addr_end;          /* points to end of addr */</div><div class='del'>-	gchar *ptr1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* check the incoming args */</div><div class='del'>-	if (!text || !*text)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* scan the string for an open brace */</div><div class='del'>-	for (addr_strt = text; *addr_strt; addr_strt++) </div><div class='del'>-		if (*addr_strt == '&lt;')</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (*addr_strt) {</div><div class='del'>-		/* we found an open brace, let's look for it's counterpart */</div><div class='del'>-		for (addr_end = addr_strt; *addr_end; addr_end++)</div><div class='del'>-			if (*addr_end == '&gt;') </div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		/* if we didn't find it, or braces are empty... */</div><div class='del'>-		if (!(*addr_end) || (addr_strt == addr_end - 1))</div><div class='del'>-			return NULL;</div><div class='del'>-			</div><div class='del'>-		/* addr_strt points to '&lt;' and addr_end points to '&gt;'.</div><div class='del'>-		 * Now let's adjust 'em slightly to point to the beginning</div><div class='del'>-		 * and ending of the email addy</div><div class='del'>-		 */</div><div class='del'>-		addr_strt++;</div><div class='del'>-		addr_end--;</div><div class='del'>-	} else {</div><div class='del'>-		/* no open brace...assume type 3 or 4? */</div><div class='del'>-		addr_strt = text;</div><div class='del'>-			</div><div class='del'>-		/* find the end of the email addr/string */</div><div class='del'>-		for (addr_end = addr_strt; *addr_end || *addr_end == ' '; addr_end++);</div><div class='del'>- </div><div class='del'>-		addr_end--;       /* points to NULL, move it back one char */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now addr_strt &amp; addr_end point to the beginning &amp; ending of the email addy */</div><div class='del'>-</div><div class='del'>-	/* copy the string into addr */</div><div class='del'>-	addr = g_strndup (addr_strt, (gint)(addr_end - addr_strt + 1));</div><div class='del'>-</div><div class='del'>-	for (ptr1 = addr_strt; ptr1 &lt;= addr_end; ptr1++)    /* look for an '@' sign */</div><div class='del'>-		if (*ptr1 == '@')</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (*ptr1 != '@') {</div><div class='del'>-		/* here we found out the name doesn't have an '@' part</div><div class='del'>-		 * let's figure out what machine we're on &amp; stick it on the end</div><div class='del'>-		 */</div><div class='del'>-		gchar hostname[MAXHOSTNAMELEN];</div><div class='del'>-</div><div class='del'>-		if (gethostname (hostname, MAXHOSTNAMELEN)) {</div><div class='del'>-			g_free (addr);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		tmp = addr;</div><div class='del'>-		addr = g_strconcat (tmp, "@", hostname, NULL);</div><div class='del'>-		g_free (tmp);</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'>-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'>-	gchar *cmdbuf, *respbuf = NULL;</div><div class='del'>-	struct hostent *host;</div><div class='del'>-</div><div class='del'>-	/* get the local host name */</div><div class='del'>-	host = gethostbyaddr ((gchar *)&amp;transport-&gt;localaddr.sin_addr, sizeof (transport-&gt;localaddr.sin_addr), AF_INET);</div><div class='del'>-</div><div class='del'>-	/* hiya server! how are you today? */</div><div class='del'>-	if (transport-&gt;smtp_is_esmtp)</div><div class='del'>-		cmdbuf = g_strdup_printf ("EHLO %s\r\n", host &amp;&amp; host-&gt;h_name ? host-&gt;h_name : </div><div class='del'>-					  inet_ntoa (transport-&gt;localaddr.sin_addr));</div><div class='del'>-	else</div><div class='del'>-		cmdbuf = g_strdup_printf ("HELO %s\r\n", host &amp;&amp; host-&gt;h_name ? host-&gt;h_name : </div><div class='del'>-					  inet_ntoa (transport-&gt;localaddr.sin_addr));</div><div class='del'>-</div><div class='del'>-	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: "</div><div class='del'>-				      "%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 "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'>-		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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "HELO response error: "</div><div class='del'>-					      "%s: non-fatal",</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if (transport-&gt;smtp_is_esmtp &amp;&amp; strstr (respbuf, "AUTH")) {</div><div class='del'>-			/* parse for supported AUTH types */</div><div class='del'>-			g_strchomp (respbuf);</div><div class='del'>-			transport-&gt;esmtp_supported_authtypes = esmtp_get_authtypes (respbuf);</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_mail (CamelSmtpTransport *transport, gchar *sender, 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'>-	gchar *cmdbuf, *respbuf = NULL;</div><div class='del'>-</div><div class='del'>-	/* enclose address in &lt;&gt;'s since some SMTP daemons *require* that */</div><div class='del'>-	cmdbuf = g_strdup_printf ("MAIL FROM: &lt;%s&gt;\r\n", sender);</div><div class='del'>-</div><div class='del'>-	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: "</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'>-	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'>-		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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "MAIL FROM response error: "</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'>-	} 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, gchar *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'>-	gchar *cmdbuf, *respbuf = NULL;</div><div class='del'>-</div><div class='del'>-	/* enclose address in &lt;&gt;'s since some SMTP daemons *require* that */</div><div class='del'>-	cmdbuf = g_strdup_printf ("RCPT TO: &lt;%s&gt;\r\n", recipient);</div><div class='del'>-</div><div class='del'>-	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: "</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'>-	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'>-		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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "RCPT TO response error: "</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'>-	} 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, CamelMedium *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* now we can actually send what's important :p */</div><div class='del'>-	gchar *cmdbuf, *respbuf = NULL;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *mimefilter;</div><div class='del'>-	gint id;</div><div class='del'>-</div><div class='del'>-	/* enclose address in &lt;&gt;'s since some SMTP daemons *require* that */</div><div class='del'>-	cmdbuf = g_strdup ("DATA\r\n");</div><div class='del'>-</div><div class='del'>-	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: "</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'>-	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'>-	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'>-		g_free (respbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "DATA response error: "</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'>-	/* setup stream filtering */</div><div class='del'>-	mimefilter = 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'>-	id = camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (mimefilter));</div><div class='del'>-</div><div class='del'>-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (filtered_stream)) == -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'>-	camel_stream_filter_remove (filtered_stream, id);</div><div class='del'>-	camel_stream_close (CAMEL_STREAM(filtered_stream));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(filtered_stream));</div><div class='del'>-</div><div class='del'>-	/* terminate the message body */</div><div class='del'>-</div><div class='del'>-	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'>-		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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "DATA response error: 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'>-	} 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'>-	gchar *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'>-	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: "</div><div class='del'>-				      "%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'>-		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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "RSET response error: "</div><div class='del'>-					      "%s",</div><div class='del'>-					      g_strerror (errno));</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'>-	gchar *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'>-	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: "</div><div class='del'>-				      "%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'>-		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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "QUIT response error: "</div><div class='del'>-					      "%s: non-fatal",</div><div class='del'>-					      g_strerror (errno));</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 c11b8b4738..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-transport.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/smtp/camel-smtp-transport.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-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 Helix Code, Inc. (www.helixcode.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 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'>-</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 &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'>-</div><div class='del'>-#include "camel-transport.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)     (GTK_CHECK_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransportClass))</div><div class='del'>-#define IS_CAMEL_SMTP_TRANSPORT(o)    (GTK_CHECK_TYPE((o), CAMEL_SMTP_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'>-	CamelStream *istream, *ostream;</div><div class='del'>-</div><div class='del'>-	gboolean smtp_is_esmtp;</div><div class='del'>-</div><div class='del'>-	struct sockaddr_in localaddr;</div><div class='del'>-</div><div class='del'>-	GList *esmtp_supported_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 Gtk function */</div><div class='del'>-GtkType 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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/providers/vee/.cvsignore b/camel/providers/vee/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/.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/providers/vee/Makefile.am b/camel/providers/vee/Makefile.am<br/>deleted file mode 100644<br/>index 849d6ae2e8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/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'>-SUBDIRS = </div><div class='del'>-</div><div class='del'>-libcamelveeincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-providerdir = $(pkglibdir)/camel-providers/$(VERSION)</div><div class='del'>-</div><div class='del'>-provider_LTLIBRARIES = libcamelvee.la</div><div class='del'>-provider_DATA = libcamelvee.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)/libibex			\</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'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-vee-provider\"	</div><div class='del'>-</div><div class='del'>-libcamelvee_la_SOURCES = 			\</div><div class='del'>-	camel-vee-folder.c			\</div><div class='del'>-	camel-vee-provider.c			\</div><div class='del'>-	camel-vee-store.c</div><div class='del'>-</div><div class='del'>-libcamelveeinclude_HEADERS =			\</div><div class='del'>-	camel-vee-folder.h			\</div><div class='del'>-	camel-vee-store.h</div><div class='del'>-</div><div class='del'>-libcamelvee_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-libcamelvee_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-#libcamelvee_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelvee.urls</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/vee/camel-vee-folder.c b/camel/providers/vee/camel-vee-folder.c<br/>deleted file mode 100644<br/>index 9d0d33b475..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-folder.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/camel-vee-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,587 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-vee-folder.h"</div><div class='del'>-#include "camel-folder-summary.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'>-/* 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 _CamelVeeFolderPrivate {</div><div class='del'>-	GList *folders;</div><div class='del'>-};</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_init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-		      CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		      gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-		      CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *vee_get_uids  (CamelFolder *folder, CamelException *ex);</div><div class='del'>-GPtrArray *vee_get_summary (CamelFolder *folder, CamelException *ex);</div><div class='del'>-void vee_free_summary (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-</div><div class='del'>-static gint vee_get_message_count (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *vee_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *vee_summary_get_by_uid(CamelFolder *f, const char *uid);</div><div class='del'>-static GList *vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static guint32 vee_get_message_flags (CamelFolder *folder, const char *uid, CamelException *ex);</div><div class='del'>-static void vee_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set, CamelException *ex);</div><div class='del'>-static gboolean vee_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name, CamelException *ex);</div><div class='del'>-static void vee_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value, CamelException *ex);</div><div class='del'>-</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   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static void vee_folder_build(CamelVeeFolder *vf, CamelException *ex);</div><div class='del'>-static void vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *camel_vee_folder_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_vee_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'>-			"CamelVeeFolder",</div><div class='del'>-			sizeof (CamelVeeFolder),</div><div class='del'>-			sizeof (CamelVeeFolderClass),</div><div class='del'>-			(GtkClassInitFunc) camel_vee_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_vee_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 (camel_folder_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'>-camel_vee_folder_class_init (CamelVeeFolderClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelFolderClass *folder_class = (CamelFolderClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_vee_folder_parent = gtk_type_class (camel_folder_get_type ());</div><div class='del'>-</div><div class='del'>-	printf("vfolder class init\n");</div><div class='del'>-	</div><div class='del'>-	folder_class-&gt;init = vee_init;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;get_uids = vee_get_uids;</div><div class='del'>-	folder_class-&gt;get_summary = vee_get_summary;</div><div class='del'>-	folder_class-&gt;free_summary = vee_free_summary;</div><div class='del'>-	folder_class-&gt;get_message_by_uid = vee_get_message_by_uid;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;summary_get_by_uid = vee_summary_get_by_uid;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;get_message_count = vee_get_message_count;</div><div class='del'>-	folder_class-&gt;search_by_expression = vee_search_by_expression;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;get_message_flags = vee_get_message_flags;</div><div class='del'>-	folder_class-&gt;set_message_flags = vee_set_message_flags;</div><div class='del'>-	folder_class-&gt;get_message_user_flag = vee_get_message_user_flag;</div><div class='del'>-	folder_class-&gt;set_message_user_flag = vee_set_message_user_flag;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_vee_folder_finalise;</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'>-camel_vee_folder_init (CamelVeeFolder *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p;</div><div class='del'>-</div><div class='del'>-	printf("vfolder init\n");</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_folder_finalise (GtkObject *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'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-		gtk_object_unref((GtkObject *)f);</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	((GtkObjectClass *)(camel_vee_folder_parent))-&gt;finalize((GtkObject *)obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_new:</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'>-CamelVeeFolder *</div><div class='del'>-camel_vee_folder_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *new = CAMEL_VEE_FOLDER ( gtk_type_new (camel_vee_folder_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed(CamelFolder *sub, int type, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	CamelException *ex;</div><div class='del'>-</div><div class='del'>-	printf("subfolder changed!!, re-searching\n");</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-	vee_folder_build_folder(vf, sub, ex);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-	/* FIXME: should only raise follow-on event if the result changed */</div><div class='del'>-	gtk_signal_emit_by_name((GtkObject *)vf, "folder_changed", 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* track flag changes in the summary */</div><div class='del'>-static void</div><div class='del'>-message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *mf)</div><div class='del'>-{</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-	CamelMessageInfo *vinfo;</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-	char *vuid;</div><div class='del'>-</div><div class='del'>-	printf("VMessage changed: %s\n", uid);</div><div class='del'>-	info = camel_folder_summary_get_by_uid(f, uid);</div><div class='del'>-</div><div class='del'>-	vuid = g_strdup_printf("%p:%s", f, uid);</div><div class='del'>-	vinfo = (CamelMessageInfo *)vee_summary_get_by_uid((CamelFolder *)mf, vuid);</div><div class='del'>-	if (info &amp;&amp; vinfo) {</div><div class='del'>-		vinfo-&gt;flags = info-&gt;flags;</div><div class='del'>-		camel_flag_list_free(&amp;vinfo-&gt;user_flags);</div><div class='del'>-		flag = info-&gt;user_flags;</div><div class='del'>-		while (flag) {</div><div class='del'>-			camel_flag_set(&amp;vinfo-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-			flag = flag-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		gtk_signal_emit_by_name((GtkObject *)mf, "message_changed", vinfo-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-	g_free(vuid);</div><div class='del'>-}</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);</div><div class='del'>-	CamelException *ex;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref((GtkObject *)sub);</div><div class='del'>-	p-&gt;folders = g_list_append(p-&gt;folders, sub);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect((GtkObject *)sub, "folder_changed", folder_changed, vf);</div><div class='del'>-	gtk_signal_connect((GtkObject *)sub, "message_changed", message_changed, vf);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-	vee_folder_build_folder(vf, sub, ex);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-	/* FIXME: should only raise follow-on event if the result changed */</div><div class='del'>-	gtk_signal_emit_by_name((GtkObject *)vf, "folder_changed", 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void vee_init (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-		      CamelFolder *parent_folder, const gchar *name,</div><div class='del'>-		      gchar *separator, gboolean path_begins_with_sep,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-	char *namepart, *searchpart;</div><div class='del'>-</div><div class='del'>-	namepart = g_strdup(name);</div><div class='del'>-	searchpart = strchr(namepart, '?');</div><div class='del'>-	if (searchpart == NULL) {</div><div class='del'>-		/* no search, no result! */</div><div class='del'>-		searchpart = "(body-contains \"=some-invalid_string-sequence=xx\")";</div><div class='del'>-	} else {</div><div class='del'>-		*searchpart++ = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_vee_folder_parent-&gt;init (folder, parent_store, parent_folder, name, separator, TRUE, ex);</div><div class='del'>-	if (camel_exception_get_id (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	folder-&gt;can_hold_messages = TRUE;</div><div class='del'>-	folder-&gt;can_hold_folders = FALSE;</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-	folder-&gt;has_search_capability = TRUE;</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'>-	vf-&gt;messages = g_ptr_array_new();</div><div class='del'>-	vf-&gt;messages_uid = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	vf-&gt;expression = g_strdup_printf("(or\n (match-all (user-flag \"%s\"))\n %s\n)", namepart, searchpart);</div><div class='del'>-	vf-&gt;vname = g_strdup(namepart);</div><div class='del'>-</div><div class='del'>-	printf("VFolder expression is %s\n", vf-&gt;expression);</div><div class='del'>-	printf("VFolder full name = %s\n", camel_folder_get_full_name(folder));</div><div class='del'>-</div><div class='del'>-	g_free(namepart);</div><div class='del'>-</div><div class='del'>-	vee_folder_build(vf, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint vee_get_message_count (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return vf-&gt;messages-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_real_message (CamelFolder *folder, const char *uid,</div><div class='del'>-		  CamelFolder **out_folder, const char **out_uid,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = (CamelVeeMessageInfo *)vee_summary_get_by_uid(folder, uid);</div><div class='del'>-	if (mi == NULL) {</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'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out_folder = mi-&gt;folder;</div><div class='del'>-	*out_uid = strchr(mi-&gt;info.uid, ':')+1;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *vee_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *real_uid;</div><div class='del'>-	CamelFolder *real_folder;</div><div class='del'>-</div><div class='del'>-	if (!get_real_message (folder, uid, &amp;real_folder, &amp;real_uid, ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return camel_folder_get_message_by_uid(real_folder, real_uid, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *vee_get_summary (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return vf-&gt;messages;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void vee_free_summary (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	/* no op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *vee_summary_get_by_uid(CamelFolder *f, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)f;</div><div class='del'>-</div><div class='del'>-	return g_hash_table_lookup(vf-&gt;messages_uid, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *vee_get_uids (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *result;</div><div class='del'>-	int i;</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-</div><div class='del'>-	result = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (result, vf-&gt;messages-&gt;len);</div><div class='del'>-	for (i=0;i&lt;vf-&gt;messages-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *mi = g_ptr_array_index(vf-&gt;messages, i);</div><div class='del'>-		result-&gt;pdata[i] = g_strdup(mi-&gt;uid);</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 GList *</div><div class='del'>-vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *result = NULL, *node;</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'>-</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'>-		GList *matches, *match;</div><div class='del'>-		matches = camel_folder_search_by_expression(f, vf-&gt;expression, ex);</div><div class='del'>-		match = matches;</div><div class='del'>-		while (match) {</div><div class='del'>-			char *uid = match-&gt;data;</div><div class='del'>-			result = g_list_prepend(result, g_strdup_printf("%p:%s", f, uid));</div><div class='del'>-			match = g_list_next(match);</div><div class='del'>-		}</div><div class='del'>-		g_list_free(matches);</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-vee_get_message_flags(CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *real_uid;</div><div class='del'>-	CamelFolder *real_folder;</div><div class='del'>-</div><div class='del'>-	if (!get_real_message (folder, uid, &amp;real_folder, &amp;real_uid, ex))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return camel_folder_get_message_flags(real_folder, real_uid, ex);</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,</div><div class='del'>-		      guint32 set, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *real_uid;</div><div class='del'>-	CamelFolder *real_folder;</div><div class='del'>-</div><div class='del'>-	if (!get_real_message (folder, uid, &amp;real_folder, &amp;real_uid, ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	camel_folder_set_message_flags(real_folder, real_uid, flags, set, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-vee_get_message_user_flag(CamelFolder *folder, const char *uid,</div><div class='del'>-			  const char *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *real_uid;</div><div class='del'>-	CamelFolder *real_folder;</div><div class='del'>-</div><div class='del'>-	if (!get_real_message (folder, uid, &amp;real_folder, &amp;real_uid, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return camel_folder_get_message_user_flag(real_folder, real_uid, name, ex);</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,</div><div class='del'>-			  const char *name, gboolean value,</div><div class='del'>-			  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *real_uid;</div><div class='del'>-	CamelFolder *real_folder;</div><div class='del'>-</div><div class='del'>-	if (!get_real_message (folder, uid, &amp;real_folder, &amp;real_uid, ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	return camel_folder_set_message_user_flag(real_folder, real_uid, name, value, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  need incremental update, based on folder.</div><div class='del'>-  Need to watch folders for changes and update accordingly.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* this does most of the vfolder magic */</div><div class='del'>-static void</div><div class='del'>-vee_folder_build(CamelVeeFolder *vf, CamelException *ex)</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'>-	GPtrArray *messages;</div><div class='del'>-	GHashTable *messages_uid;</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;vf-&gt;messages-&gt;len;i++) {</div><div class='del'>-			CamelVeeMessageInfo *mi = g_ptr_array_index(vf-&gt;messages, i);</div><div class='del'>-			g_free(mi-&gt;info.subject);</div><div class='del'>-			g_free(mi-&gt;info.to);</div><div class='del'>-			g_free(mi-&gt;info.from);</div><div class='del'>-			g_free(mi-&gt;info.uid);</div><div class='del'>-			camel_flag_list_free(&amp;mi-&gt;info.user_flags);</div><div class='del'>-			g_free(mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("building folder expression: %s\n", vf-&gt;expression);</div><div class='del'>-</div><div class='del'>-	messages = g_ptr_array_new();</div><div class='del'>-	messages_uid = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		GList *matches, *match;</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-		CamelVeeMessageInfo *mi;</div><div class='del'>-		const CamelMessageInfo *info;</div><div class='del'>-		CamelFlag *flag;</div><div class='del'>-</div><div class='del'>-		printf("searching folder: (%s)%s\n",</div><div class='del'>-		       gtk_type_name(((GtkObject *)f)-&gt;klass-&gt;type),</div><div class='del'>-		       camel_folder_get_full_name(f));</div><div class='del'>-</div><div class='del'>-		matches = camel_folder_search_by_expression(f, vf-&gt;expression, ex);</div><div class='del'>-		match = matches;</div><div class='del'>-		while (match) {</div><div class='del'>-			info = camel_folder_summary_get_by_uid(f, match-&gt;data);</div><div class='del'>-			if (info) {</div><div class='del'>-				mi = g_malloc0(sizeof(*mi));</div><div class='del'>-				mi-&gt;info.subject = g_strdup(info-&gt;subject);</div><div class='del'>-				mi-&gt;info.to = g_strdup(info-&gt;to);</div><div class='del'>-				mi-&gt;info.from = g_strdup(info-&gt;from);</div><div class='del'>-				mi-&gt;info.uid = g_strdup_printf("%p:%s", f, info-&gt;uid);</div><div class='del'>-				mi-&gt;info.flags = info-&gt;flags;</div><div class='del'>-				mi-&gt;info.size = info-&gt;size;</div><div class='del'>-				mi-&gt;info.date_sent = info-&gt;date_sent;</div><div class='del'>-				mi-&gt;info.date_received = info-&gt;date_received;</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;info.user_flags, flag-&gt;name, TRUE);</div><div class='del'>-					flag = flag-&gt;next;</div><div class='del'>-				}</div><div class='del'>-				mi-&gt;info.content = NULL;</div><div class='del'>-				mi-&gt;folder = f;</div><div class='del'>-				g_ptr_array_add(messages, mi);</div><div class='del'>-				g_hash_table_insert(messages_uid, mi-&gt;info.uid, mi);</div><div class='del'>-			}</div><div class='del'>-			match = g_list_next(match);</div><div class='del'>-		}</div><div class='del'>-		g_list_free(matches);</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("search complete\n");</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(vf-&gt;messages, TRUE);</div><div class='del'>-	vf-&gt;messages = messages;</div><div class='del'>-	g_hash_table_destroy(vf-&gt;messages_uid);</div><div class='del'>-	vf-&gt;messages_uid = messages_uid;</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 void</div><div class='del'>-vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *matches, *match;</div><div class='del'>-	CamelFolder *f = source;</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-</div><div class='del'>-	GPtrArray *messages;</div><div class='del'>-	GHashTable *messages_uid;</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;vf-&gt;messages-&gt;len;i++) {</div><div class='del'>-			CamelVeeMessageInfo *mi = g_ptr_array_index(vf-&gt;messages, i);</div><div class='del'>-			if (mi-&gt;folder == source) {</div><div class='del'>-				g_hash_table_remove(vf-&gt;messages_uid, mi-&gt;info.uid);</div><div class='del'>-				g_ptr_array_remove_index_fast(vf-&gt;messages, i);</div><div class='del'>-</div><div class='del'>-				g_free(mi-&gt;info.subject);</div><div class='del'>-				g_free(mi-&gt;info.to);</div><div class='del'>-				g_free(mi-&gt;info.from);</div><div class='del'>-				g_free(mi-&gt;info.uid);</div><div class='del'>-				camel_flag_list_free(&amp;mi-&gt;info.user_flags);</div><div class='del'>-				g_free(mi);</div><div class='del'>-				i--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	messages = vf-&gt;messages;</div><div class='del'>-	messages_uid = vf-&gt;messages_uid;</div><div class='del'>-	</div><div class='del'>-	matches = camel_folder_search_by_expression(f, vf-&gt;expression, ex);</div><div class='del'>-	match = matches;</div><div class='del'>-	while (match) {</div><div class='del'>-		info = camel_folder_summary_get_by_uid(f, match-&gt;data);</div><div class='del'>-		if (info) {</div><div class='del'>-			mi = g_malloc0(sizeof(*mi));</div><div class='del'>-			mi-&gt;info.subject = g_strdup(info-&gt;subject);</div><div class='del'>-			mi-&gt;info.to = g_strdup(info-&gt;to);</div><div class='del'>-			mi-&gt;info.from = g_strdup(info-&gt;from);</div><div class='del'>-			mi-&gt;info.uid = g_strdup_printf("%p:%s", f, info-&gt;uid);</div><div class='del'>-			mi-&gt;info.flags = info-&gt;flags;</div><div class='del'>-			mi-&gt;info.size = info-&gt;size;</div><div class='del'>-			mi-&gt;info.date_sent = info-&gt;date_sent;</div><div class='del'>-			mi-&gt;info.date_received = info-&gt;date_received;</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;info.user_flags, flag-&gt;name, TRUE);</div><div class='del'>-				flag = flag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			mi-&gt;info.content = NULL;</div><div class='del'>-			mi-&gt;folder = f;</div><div class='del'>-			g_ptr_array_add(messages, mi);</div><div class='del'>-			g_hash_table_insert(messages_uid, mi-&gt;info.uid, mi);</div><div class='del'>-		}</div><div class='del'>-		match = g_list_next(match);</div><div class='del'>-	}</div><div class='del'>-	g_list_free(matches);</div><div class='del'>-}</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='head'>diff --git a/camel/providers/vee/camel-vee-folder.h b/camel/providers/vee/camel-vee-folder.h<br/>deleted file mode 100644<br/>index ea2a82a25b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-folder.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/camel-vee-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#ifndef _CAMEL_VEE_FOLDER_H</div><div class='del'>-#define _CAMEL_VEE_FOLDER_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.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)         GTK_CHECK_CAST (obj, camel_vee_folder_get_type (), CamelVeeFolder)</div><div class='del'>-#define CAMEL_VEE_FOLDER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_vee_folder_get_type (), CamelVeeFolderClass)</div><div class='del'>-#define IS_CAMEL_VEE_FOLDER(obj)      GTK_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'>-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'>-	CamelFolder *local;	/* local storage for folder */</div><div class='del'>-</div><div class='del'>-	/* FIXME: Move this to a summary object??? */</div><div class='del'>-	GPtrArray *messages; /* message info's */</div><div class='del'>-	GHashTable *messages_uid;</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'>-guint		camel_vee_folder_get_type	(void);</div><div class='del'>-CamelVeeFolder      *camel_vee_folder_new	(void);</div><div class='del'>-</div><div class='del'>-void camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_VEE_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/vee/camel-vee-provider.c b/camel/providers/vee/camel-vee-provider.c<br/>deleted file mode 100644<br/>index e36e7fcff1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-provider.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/camel-vee-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#include "config.h"</div><div class='del'>-#include "camel-vee-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'>-</div><div class='del'>-static CamelProvider vee_provider = {</div><div class='del'>-	"vfolder",</div><div class='del'>-	"Virtual folder email provider",</div><div class='del'>-</div><div class='del'>-	"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'>-	0,</div><div class='del'>-</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-</div><div class='del'>-	NULL</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'>-	vee_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_vee_store_get_type();</div><div class='del'>-</div><div class='del'>-	vee_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);</div><div class='del'>-	</div><div class='del'>-	camel_session_register_provider (session, &amp;vee_provider);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/vee/camel-vee-store.c b/camel/providers/vee/camel-vee-store.c<br/>deleted file mode 100644<br/>index ecc37982e4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-store.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/camel-vee-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#include "camel-vee-store.h"</div><div class='del'>-#include "camel-vee-folder.h"</div><div class='del'>-</div><div class='del'>-static CamelFolder *vee_get_folder (CamelStore *store, const char *folder_name, gboolean create, CamelException *ex);</div><div class='del'>-static char *vee_get_folder_name (CamelStore *store, const char *folder_name, 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   (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *camel_vee_store_parent;</div><div class='del'>-</div><div class='del'>-enum SIGNALS {</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'>-camel_vee_store_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'>-			"CamelVeeStore",</div><div class='del'>-			sizeof (CamelVeeStore),</div><div class='del'>-			sizeof (CamelVeeStoreClass),</div><div class='del'>-			(GtkClassInitFunc) camel_vee_store_class_init,</div><div class='del'>-			(GtkObjectInitFunc) camel_vee_store_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 (camel_store_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'>-</div><div class='del'>-camel_vee_store_class_init (CamelVeeStoreClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	CamelStoreClass *store_class = (CamelStoreClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_vee_store_parent = gtk_type_class (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;get_folder_name = vee_get_folder_name;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = camel_vee_store_finalise;</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'>-camel_vee_store_init (CamelVeeStore *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeStorePrivate *p;</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 (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	((GtkObjectClass *)(camel_vee_store_parent))-&gt;finalize((GtkObject *)obj);</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 ( gtk_type_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, gboolean create, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	folder =  gtk_type_new (camel_vee_folder_get_type());</div><div class='del'>-</div><div class='del'>-	printf("my type is: %s\n", gtk_type_name(((GtkObject *)folder)-&gt;klass-&gt;type));</div><div class='del'>-</div><div class='del'>-	((CamelFolderClass *)((GtkObject *)folder)-&gt;klass)-&gt;init (folder, store, NULL, folder_name, "/", TRUE, ex);</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-vee_get_folder_name (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/vee/camel-vee-store.h b/camel/providers/vee/camel-vee-store.h<br/>deleted file mode 100644<br/>index 848769296a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-store.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/camel-vee-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@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 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'>-#ifndef _CAMEL_VEE_STORE_H</div><div class='del'>-#define _CAMEL_VEE_STORE_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.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)         GTK_CHECK_CAST (obj, camel_vee_store_get_type (), CamelVeeStore)</div><div class='del'>-#define CAMEL_VEE_STORE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_vee_store_get_type (), CamelVeeStoreClass)</div><div class='del'>-#define IS_CAMEL_VEE_STORE(obj)      GTK_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'>-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'>-guint		camel_vee_store_get_type	(void);</div><div class='del'>-CamelVeeStore      *camel_vee_store_new	(void);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_VEE_STORE_H */</div><div class='head'>diff --git a/camel/providers/vee/libcamelvee.urls b/camel/providers/vee/libcamelvee.urls<br/>deleted file mode 100644<br/>index 6fa58dadb5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/libcamelvee.urls?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/providers/vee/libcamelvee.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-vfolder</div><div class='head'>diff --git a/camel/string-utils.c b/camel/string-utils.c<br/>deleted file mode 100644<br/>index 8c46df7a60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/string-utils.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/string-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,197 +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'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.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 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'>-#include &lt;config.h&gt;</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'>-gchar *</div><div class='del'>-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'>-	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'>-	for (ptr = (char *)haystack; *(ptr + len - 1) != '\0'; ptr++)</div><div class='del'>-		if (!g_strncasecmp(ptr, needle, len))</div><div class='del'>-			return 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 fa6297a5e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/string-utils.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>camel/string-utils.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'>-/* string-util : utilities for normal gchar * strings  */</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 Helix Code, Inc. (http://www.helixcode.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 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'>-</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, gboolean *suffix_found);</div><div class='del'>-</div><div class='del'>-gchar   *strstrcase (const gchar *haystack, const gchar *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/composer/.cvsignore b/composer/.cvsignore<br/>deleted file mode 100644<br/>index bca1932d07..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/.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'>-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='head'>diff --git a/composer/ChangeLog b/composer/ChangeLog<br/>deleted file mode 100644<br/>index b51ae878b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/ChangeLog?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,339 +0,0 @@</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/Makefile.am b/composer/Makefile.am<br/>deleted file mode 100644<br/>index 7a4e254ab3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</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-address-dialog.glade	\</div><div class='del'>-	e-msg-composer-address-dialog.glade.h	\</div><div class='del'>-	e-msg-composer-attachment.glade		\</div><div class='del'>-	e-msg-composer-attachment.glade.h</div><div class='del'>-</div><div class='del'>-libcomposerincludedir = $(includedir)/composer</div><div class='del'>-</div><div class='del'>-noinst_LTLIBRARIES = libcomposer.la</div><div class='del'>-libcomposer_la_LDFLAGS = -static</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)/camel			\</div><div class='del'>-	-I$(top_builddir)/camel			\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"composer\"</div><div class='del'>-</div><div class='del'>-CPPFLAGS =					\</div><div class='del'>-	-DE_GLADEDIR=\"$(gladedir)\"</div><div class='del'>-</div><div class='del'>-libcomposer_la_SOURCES = 			\</div><div class='del'>-	e-msg-composer-address-dialog.c		\</div><div class='del'>-	e-msg-composer-address-dialog.h		\</div><div class='del'>-	e-msg-composer-address-entry.c		\</div><div class='del'>-	e-msg-composer-address-entry.h		\</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.c			</div><div class='del'>-	e-msg-composer.h			</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =					\</div><div class='del'>-	$(glade_DATA)				\</div><div class='del'>-	ChangeLog</div><div class='head'>diff --git a/composer/e-msg-composer-address-dialog.c b/composer/e-msg-composer-address-dialog.c<br/>deleted file mode 100644<br/>index 42a594756d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-address-dialog.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-address-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,660 +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-address-dialog.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Helix Code, 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 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: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "e-msg-composer-address-dialog.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	APPLY,</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 GnomeDialogClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This function should load the addresses we know of into the dialog.  We</div><div class='del'>-   don't have a precise setup for the addressbook yet, so we will just put some</div><div class='del'>-   fake entries in.  */</div><div class='del'>-static void</div><div class='del'>-load_addresses (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gchar *text[][3] = {</div><div class='del'>-		{ "Bertrand Guiheneuf", "Bertrand.Guiheneuf@aful.org", NULL },</div><div class='del'>-		{ "Ettore Perazzoli", "ettore@gnu.org", NULL },</div><div class='del'>-		{ "Miguel de Icaza", "miguel@gnu.org", NULL },</div><div class='del'>-		{ "Nat Friedman", "nat@nat.org", NULL },</div><div class='del'>-		{ NULL, NULL, NULL }</div><div class='del'>-	};</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	guint i;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (glade_xml_get_widget (dialog-&gt;gui, "address_clist"));</div><div class='del'>-</div><div class='del'>-	for (i = 0; text[i][0] != NULL; i++)</div><div class='del'>-		gtk_clist_append (clist, text[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Combine name and email into an address, e.g. "Ettore Perazzoli</div><div class='del'>-   &lt;ettore@gnu.org&gt;".  FIXME FIXME FIXME this does not handle quoting (commas</div><div class='del'>-   will cause troubles), but it should.  */</div><div class='del'>-static gchar *</div><div class='del'>-make_full_address (const gchar *name,</div><div class='del'>-		   const gchar *email)</div><div class='del'>-{</div><div class='del'>-	return g_strconcat (name, " &lt;", email, "&gt;", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This loads the selected address in the address GtkCList into the requested</div><div class='del'>-   GtkList.  */</div><div class='del'>-static void</div><div class='del'>-add_address (EMsgComposerAddressDialog *dialog,</div><div class='del'>-	     const gchar *list_name)</div><div class='del'>-{</div><div class='del'>-	GtkCList *src_clist;</div><div class='del'>-	GtkCList *dest_clist;</div><div class='del'>-	gchar *name, *email;</div><div class='del'>-	gchar *text[2];</div><div class='del'>-	guint row;</div><div class='del'>-</div><div class='del'>-	src_clist = GTK_CLIST (glade_xml_get_widget (dialog-&gt;gui,</div><div class='del'>-						     "address_clist"));</div><div class='del'>-	if (src_clist-&gt;selection == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dest_clist = GTK_CLIST (glade_xml_get_widget (dialog-&gt;gui, list_name));</div><div class='del'>-	row = GPOINTER_TO_INT (src_clist-&gt;selection-&gt;data);</div><div class='del'>-</div><div class='del'>-	gtk_clist_get_text (src_clist, row, 0, &amp;name);</div><div class='del'>-	gtk_clist_get_text (src_clist, row, 1, &amp;email);</div><div class='del'>-</div><div class='del'>-	text[0] = make_full_address (name, email);</div><div class='del'>-	text[1] = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_clist_append (dest_clist, text);</div><div class='del'>-</div><div class='del'>-	g_free (text[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-apply (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (dialog), signals[APPLY]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Recipient list popup menu.  */</div><div class='del'>-</div><div class='del'>-struct _RecipientListInfo {</div><div class='del'>-	EMsgComposerAddressDialog *dialog;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	gint row;		/* -1 if menu was popped up in an empty</div><div class='del'>-				   area.  */</div><div class='del'>-};</div><div class='del'>-typedef struct _RecipientListInfo RecipientListInfo;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_recipient (RecipientListInfo *info,</div><div class='del'>-		gboolean remove)</div><div class='del'>-{</div><div class='del'>-	gchar *text;</div><div class='del'>-	gint row;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;clist-&gt;selection == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	row = GPOINTER_TO_INT (info-&gt;clist-&gt;selection-&gt;data);</div><div class='del'>-	gtk_clist_get_text (info-&gt;clist, row, 0, &amp;text);</div><div class='del'>-</div><div class='del'>-	g_free (info-&gt;dialog-&gt;cut_buffer);</div><div class='del'>-	info-&gt;dialog-&gt;cut_buffer = g_strdup (text);</div><div class='del'>-</div><div class='del'>-	if (remove)</div><div class='del'>-		gtk_clist_remove (info-&gt;clist, row);</div><div class='del'>-</div><div class='del'>-	gtk_selection_owner_set (GTK_WIDGET (info-&gt;clist),</div><div class='del'>-				 GDK_SELECTION_PRIMARY,</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'>-copy_recipient_cb (GtkWidget *widget,</div><div class='del'>-		   gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecipientListInfo *info;</div><div class='del'>-</div><div class='del'>-	info = (RecipientListInfo *) data;</div><div class='del'>-	copy_recipient (info, FALSE);</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'>-cut_recipient_cb (GtkWidget *widget,</div><div class='del'>-		  gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecipientListInfo *info;</div><div class='del'>-</div><div class='del'>-	info = (RecipientListInfo *) data;</div><div class='del'>-	copy_recipient (info, TRUE);</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'>-paste_recipient_cb (GtkWidget *widget,</div><div class='del'>-		    gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecipientListInfo *info;</div><div class='del'>-	GdkAtom atom;</div><div class='del'>-	gchar *text[2];</div><div class='del'>-</div><div class='del'>-	info = (RecipientListInfo *) data;</div><div class='del'>-</div><div class='del'>-	atom = gdk_atom_intern ("STRING", FALSE);</div><div class='del'>-	gtk_selection_convert (GTK_WIDGET (info-&gt;clist),</div><div class='del'>-			       GDK_SELECTION_PRIMARY,</div><div class='del'>-			       atom,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo recipient_list_item_popup_info[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Cut"),</div><div class='del'>-				N_("Cut selected item into clipboard"),</div><div class='del'>-				cut_recipient_cb,</div><div class='del'>-				GNOME_STOCK_MENU_CUT),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Copy"),</div><div class='del'>-				N_("Copy selected item into clipboard"),</div><div class='del'>-				copy_recipient_cb,</div><div class='del'>-				GNOME_STOCK_MENU_COPY),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Paste"),</div><div class='del'>-				N_("Paste item from clipboard"),</div><div class='del'>-				paste_recipient_cb,</div><div class='del'>-				GNOME_STOCK_MENU_PASTE),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo recipient_list_popup_info[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Paste"),</div><div class='del'>-				N_("Paste item from clipboard"),</div><div class='del'>-				paste_recipient_cb,</div><div class='del'>-				GNOME_STOCK_MENU_PASTE),</div><div class='del'>-	GNOMEUIINFO_END</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'>-add_to_cb (GtkWidget *widget,</div><div class='del'>-	   gpointer data)</div><div class='del'>-{</div><div class='del'>-	add_address (E_MSG_COMPOSER_ADDRESS_DIALOG (data), "to_clist");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_cc_cb (GtkWidget *widget,</div><div class='del'>-	   gpointer data)</div><div class='del'>-{</div><div class='del'>-	add_address (E_MSG_COMPOSER_ADDRESS_DIALOG (data), "cc_clist");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_bcc_cb (GtkWidget *widget,</div><div class='del'>-	   gpointer data)</div><div class='del'>-{</div><div class='del'>-	add_address (E_MSG_COMPOSER_ADDRESS_DIALOG (data), "bcc_clist");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-glade_connect (GladeXML *gui,</div><div class='del'>-	       const gchar *widget_name,</div><div class='del'>-	       const gchar *signal_name,</div><div class='del'>-	       GtkSignalFunc callback,</div><div class='del'>-	       gpointer callback_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, widget_name);</div><div class='del'>-	if (widget == NULL)</div><div class='del'>-		g_warning ("Widget `%s' was not found.", widget_name);</div><div class='del'>-	else</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (widget), signal_name,</div><div class='del'>-				    GTK_SIGNAL_FUNC (callback), callback_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-recipient_clist_button_press_cb (GtkWidget *widget,</div><div class='del'>-				 GdkEventButton *event,</div><div class='del'>-				 gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressDialog *dialog;</div><div class='del'>-	RecipientListInfo *info;</div><div class='del'>-	GtkWidget *popup;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	gboolean on_row;</div><div class='del'>-	gint row, column;</div><div class='del'>-</div><div class='del'>-	dialog = E_MSG_COMPOSER_ADDRESS_DIALOG (data);</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (widget);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;window != clist-&gt;clist_window || event-&gt;button != 3)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	on_row = gtk_clist_get_selection_info (clist, event-&gt;x, event-&gt;y,</div><div class='del'>-					       &amp;row, &amp;column);</div><div class='del'>-</div><div class='del'>-	info = g_new (RecipientListInfo, 1);</div><div class='del'>-	info-&gt;dialog = dialog;</div><div class='del'>-	info-&gt;clist = clist;</div><div class='del'>-</div><div class='del'>-	if (on_row) {</div><div class='del'>-		gtk_clist_unselect_all (clist);</div><div class='del'>-		gtk_clist_select_row (clist, row, 0);</div><div class='del'>-		info-&gt;row = row;</div><div class='del'>-		popup = gnome_popup_menu_new (recipient_list_item_popup_info);</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;row = -1;</div><div class='del'>-		popup = gnome_popup_menu_new (recipient_list_popup_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_popup_menu_do_popup_modal (popup, NULL, NULL, event, info);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (popup);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME needs more work.  */</div><div class='del'>-static void</div><div class='del'>-recipient_clist_selection_received_cb (GtkWidget *widget,</div><div class='del'>-				       GtkSelectionData *selection_data,</div><div class='del'>-				       guint time,</div><div class='del'>-				       gpointer data)</div><div class='del'>-{</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	gchar *text[2];</div><div class='del'>-	gchar *p;</div><div class='del'>-</div><div class='del'>-	puts (__FUNCTION__);</div><div class='del'>-</div><div class='del'>-	if (selection_data-&gt;length &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (widget);</div><div class='del'>-</div><div class='del'>-	/* FIXME quoting.  */</div><div class='del'>-	text[0] = g_strdup (selection_data-&gt;data);</div><div class='del'>-	text[1] = NULL;</div><div class='del'>-</div><div class='del'>-	/* It is a common mistake to paste `\n's, let's work around that.  */</div><div class='del'>-	for (p = text[0]; *p != '\0'; p++) {</div><div class='del'>-		if (*p == '\n') {</div><div class='del'>-			*p = '\0';</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (clist-&gt;selection != NULL) {</div><div class='del'>-		gint row;</div><div class='del'>-</div><div class='del'>-		row = GPOINTER_TO_INT (clist-&gt;selection-&gt;data);</div><div class='del'>-		gtk_clist_insert (clist, row, text);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_clist_append (clist, text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (text[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recipient_clist_selection_get_cb (GtkWidget *widget, </div><div class='del'>-				  GtkSelectionData *selection_data,</div><div class='del'>-				  guint info,</div><div class='del'>-				  guint time,</div><div class='del'>-				  gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressDialog *dialog;</div><div class='del'>-	GdkAtom atom;</div><div class='del'>-</div><div class='del'>-	puts (__FUNCTION__);</div><div class='del'>-</div><div class='del'>-	dialog = E_MSG_COMPOSER_ADDRESS_DIALOG (data);</div><div class='del'>-	if (dialog-&gt;cut_buffer == NULL)</div><div class='del'>-		return;		/* FIXME should I do something special?  */</div><div class='del'>-</div><div class='del'>-	atom = gdk_atom_intern ("STRING", FALSE);</div><div class='del'>-	gtk_selection_data_set (selection_data, atom, 8,</div><div class='del'>-				dialog-&gt;cut_buffer,</div><div class='del'>-				strlen (dialog-&gt;cut_buffer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recipient_clist_selection_clear_event_cb (GtkWidget *widget,</div><div class='del'>-					  GdkEventSelection *selection,</div><div class='del'>-					  gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressDialog *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = E_MSG_COMPOSER_ADDRESS_DIALOG (data);</div><div class='del'>-	g_free (dialog-&gt;cut_buffer);</div><div class='del'>-	dialog-&gt;cut_buffer = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_recipient_list_signals (EMsgComposerAddressDialog *dialog,</div><div class='del'>-			      const gchar *name)</div><div class='del'>-{</div><div class='del'>-	glade_connect (dialog-&gt;gui, name, "button_press_event",</div><div class='del'>-		       GTK_SIGNAL_FUNC (recipient_clist_button_press_cb),</div><div class='del'>-		       dialog);</div><div class='del'>-	glade_connect (dialog-&gt;gui, name, "selection_received",</div><div class='del'>-		       GTK_SIGNAL_FUNC (recipient_clist_selection_received_cb),</div><div class='del'>-		       dialog);</div><div class='del'>-	glade_connect (dialog-&gt;gui, name, "selection_get",</div><div class='del'>-		       GTK_SIGNAL_FUNC (recipient_clist_selection_get_cb),</div><div class='del'>-		       dialog);</div><div class='del'>-	glade_connect (dialog-&gt;gui, name, "selection_clear_event",</div><div class='del'>-		       GTK_SIGNAL_FUNC (recipient_clist_selection_clear_event_cb),</div><div class='del'>-		       dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_signals (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	glade_connect (dialog-&gt;gui, "to_add_button", "clicked",</div><div class='del'>-		       GTK_SIGNAL_FUNC (add_to_cb), dialog);</div><div class='del'>-	glade_connect (dialog-&gt;gui, "cc_add_button", "clicked",</div><div class='del'>-		       GTK_SIGNAL_FUNC (add_cc_cb), dialog);</div><div class='del'>-	glade_connect (dialog-&gt;gui, "bcc_add_button", "clicked",</div><div class='del'>-		       GTK_SIGNAL_FUNC (add_bcc_cb), dialog);</div><div class='del'>-</div><div class='del'>-	setup_recipient_list_signals (dialog, "to_clist");</div><div class='del'>-	setup_recipient_list_signals (dialog, "cc_clist");</div><div class='del'>-	setup_recipient_list_signals (dialog, "bcc_clist");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_selection_targets (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_selection_add_target (glade_xml_get_widget (dialog-&gt;gui, "to_clist"),</div><div class='del'>-				  GDK_SELECTION_PRIMARY,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING, 0);</div><div class='del'>-	gtk_selection_add_target (glade_xml_get_widget (dialog-&gt;gui, "cc_clist"),</div><div class='del'>-				  GDK_SELECTION_PRIMARY,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING, 0);</div><div class='del'>-	gtk_selection_add_target (glade_xml_get_widget (dialog-&gt;gui, "bcc_clist"),</div><div class='del'>-				  GDK_SELECTION_PRIMARY,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GnomeDialog methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clicked (GnomeDialog *dialog,</div><div class='del'>-	 gint button_number)</div><div class='del'>-{</div><div class='del'>-	switch (button_number) {</div><div class='del'>-	case 0:			/* OK */</div><div class='del'>-		apply (E_MSG_COMPOSER_ADDRESS_DIALOG (dialog));</div><div class='del'>-		gnome_dialog_close (dialog);</div><div class='del'>-		break;</div><div class='del'>-	case 1:			/* Apply */</div><div class='del'>-		apply (E_MSG_COMPOSER_ADDRESS_DIALOG (dialog));</div><div class='del'>-		break;</div><div class='del'>-	case 2:			/* 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'>-</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'>-	EMsgComposerAddressDialog *dialog;</div><div class='del'>-	GtkCList *address_clist;</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	dialog = E_MSG_COMPOSER_ADDRESS_DIALOG (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dialog-&gt;gui));</div><div class='del'>-	g_free (dialog-&gt;cut_buffer);</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'>-/* Initialization.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerAddressDialogClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeDialogClass *gnome_dialog_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'>-	gnome_dialog_class = GNOME_DIALOG_CLASS (class);</div><div class='del'>-	gnome_dialog_class-&gt;clicked = clicked;</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'>-	signals[APPLY]</div><div class='del'>-		= gtk_signal_new ("apply",</div><div class='del'>-				  GTK_RUN_FIRST,</div><div class='del'>-				  object_class-&gt;type,</div><div class='del'>-				  GTK_SIGNAL_OFFSET (EMsgComposerAddressDialogClass,</div><div class='del'>-						     apply),</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 (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;gui = NULL;</div><div class='del'>-	dialog-&gt;cut_buffer = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_address_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 == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposerAddressDialog",</div><div class='del'>-			sizeof (EMsgComposerAddressDialog),</div><div class='del'>-			sizeof (EMsgComposerAddressDialogClass),</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 (gnome_dialog_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'>-void</div><div class='del'>-e_msg_composer_address_dialog_construct (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	static const gchar *buttons[] = {</div><div class='del'>-		GNOME_STOCK_BUTTON_OK,</div><div class='del'>-		GNOME_STOCK_BUTTON_APPLY,</div><div class='del'>-		GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-		NULL</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_constructv (GNOME_DIALOG (dialog),</div><div class='del'>-				 _("Select recipients' addresses"),</div><div class='del'>-				 buttons);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;gui = glade_xml_new</div><div class='del'>-		(E_GLADEDIR "/e-msg-composer-address-dialog.glade",</div><div class='del'>-		 "main_table");</div><div class='del'>-	if (dialog-&gt;gui == NULL) {</div><div class='del'>-		g_warning ("Cannot load `e-msg-composer-address-dialog.glade");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (dialog)-&gt;vbox),</div><div class='del'>-			   glade_xml_get_widget (dialog-&gt;gui, "main_table"));</div><div class='del'>-</div><div class='del'>-	setup_selection_targets (dialog);</div><div class='del'>-	load_addresses (dialog);</div><div class='del'>-	setup_signals (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_address_dialog_new (void)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressDialog *new;</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (e_msg_composer_address_dialog_get_type ());</div><div class='del'>-	e_msg_composer_address_dialog_construct (new);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_list (EMsgComposerAddressDialog *dialog,</div><div class='del'>-	  const gchar *list_name,</div><div class='del'>-	  GList *list)</div><div class='del'>-{</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	GList *p;</div><div class='del'>-	gchar *text[2];</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (glade_xml_get_widget (dialog-&gt;gui, list_name));</div><div class='del'>-</div><div class='del'>-	gtk_clist_freeze (clist);</div><div class='del'>-	gtk_clist_clear (clist);</div><div class='del'>-</div><div class='del'>-	text[1] = NULL;</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next) {</div><div class='del'>-		text[0] = (gchar *) p-&gt;data;</div><div class='del'>-		gtk_clist_append (clist, text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_clist_thaw (clist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_address_dialog_set_to_list (EMsgComposerAddressDialog *dialog, </div><div class='del'>-					   GList *to_list)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	set_list (dialog, "to_clist", to_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_address_dialog_set_cc_list (EMsgComposerAddressDialog *dialog, </div><div class='del'>-					   GList *cc_list)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	set_list (dialog, "cc_clist", cc_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_address_dialog_set_bcc_list (EMsgComposerAddressDialog *dialog, </div><div class='del'>-					    GList *bcc_list)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	set_list (dialog, "bcc_clist", bcc_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-get_list (EMsgComposerAddressDialog *dialog,</div><div class='del'>-	  const gchar *clist_name)</div><div class='del'>-{</div><div class='del'>-	GtkCList *address_clist;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	GList *list;</div><div class='del'>-	guint i;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (glade_xml_get_widget (dialog-&gt;gui, clist_name));</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-	for (i = 0; i &lt; clist-&gt;rows; i++) {</div><div class='del'>-		gchar *addr;</div><div class='del'>-</div><div class='del'>-		gtk_clist_get_text (clist, i, 0, &amp;addr);</div><div class='del'>-		list = g_list_prepend (list, g_strdup (addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_list_reverse (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_address_dialog_get_to_list (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog), NULL);</div><div class='del'>-</div><div class='del'>-	return get_list (dialog, "to_clist");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_address_dialog_get_cc_list (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog), NULL);</div><div class='del'>-</div><div class='del'>-	return get_list (dialog, "cc_clist");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_address_dialog_get_bcc_list (EMsgComposerAddressDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_ADDRESS_DIALOG (dialog), NULL);</div><div class='del'>-</div><div class='del'>-	return get_list (dialog, "bcc_clist");</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-address-dialog.glade b/composer/e-msg-composer-address-dialog.glade<br/>deleted file mode 100644<br/>index c90ef3f245..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-address-dialog.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-address-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,576 +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;address-composer&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;address-composer&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;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-msg-composer-address-dialog.glade.h&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;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog1&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-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;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;main_table&lt;/name&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;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;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&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;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;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;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Recipient list:&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;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;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;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;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;5&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;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'>-</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;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;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;child&gt;</div><div class='del'>-	    &lt;padding&gt;5&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;search_button&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;65&lt;/width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Search...&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;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_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;5&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;address_clist&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;180&lt;/width&gt;</div><div class='del'>-	  &lt;height&gt;200&lt;/height&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;128,107&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;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;label5&lt;/name&gt;</div><div class='del'>-	    &lt;width&gt;50&lt;/width&gt;</div><div class='del'>-	    &lt;label&gt;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.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;label6&lt;/name&gt;</div><div class='del'>-	    &lt;width&gt;100&lt;/width&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;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;hbox2&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;True&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;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;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;label&gt;Properties...&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;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;button6&lt;/name&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;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;table2&lt;/name&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;0&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;0&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;5&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;to_add_button&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;60&lt;/width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;To: &amp;gt;&amp;gt;&lt;/label&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;5&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;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;cc_add_button&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;60&lt;/width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Cc: &amp;gt;&amp;gt;&lt;/label&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;5&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;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;bcc_add_button&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;60&lt;/width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Bcc: &amp;gt;&amp;gt;&lt;/label&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;5&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;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;scrolledwindow4&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;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;2&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;bcc_clist&lt;/name&gt;</div><div class='del'>-	    &lt;width&gt;180&lt;/width&gt;</div><div class='del'>-	    &lt;height&gt;100&lt;/height&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;label9&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label9&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;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;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;2&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;to_clist&lt;/name&gt;</div><div class='del'>-	    &lt;width&gt;180&lt;/width&gt;</div><div class='del'>-	    &lt;height&gt;100&lt;/height&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;label7&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label7&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;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow3&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;2&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;4&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;cc_clist&lt;/name&gt;</div><div class='del'>-	    &lt;width&gt;180&lt;/width&gt;</div><div class='del'>-	    &lt;height&gt;100&lt;/height&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;label8&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label8&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;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;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_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'>-  &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-address-dialog.glade.h b/composer/e-msg-composer-address-dialog.glade.h<br/>deleted file mode 100644<br/>index a5d48ec275..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-address-dialog.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-address-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Recipient list:");</div><div class='del'>-gchar *s = N_("Name:");</div><div class='del'>-gchar *s = N_("Search...");</div><div class='del'>-gchar *s = N_("Name");</div><div class='del'>-gchar *s = N_("Address");</div><div class='del'>-gchar *s = N_("Properties...");</div><div class='del'>-gchar *s = N_("Add...");</div><div class='del'>-gchar *s = N_("To: &gt;&gt;");</div><div class='del'>-gchar *s = N_("Cc: &gt;&gt;");</div><div class='del'>-gchar *s = N_("Bcc: &gt;&gt;");</div><div class='del'>-gchar *s = N_("label9");</div><div class='del'>-gchar *s = N_("label7");</div><div class='del'>-gchar *s = N_("label8");</div><div class='head'>diff --git a/composer/e-msg-composer-address-dialog.h b/composer/e-msg-composer-address-dialog.h<br/>deleted file mode 100644<br/>index 19ffeda703..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-address-dialog.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-address-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +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-address-dialog.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Helix Code, 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 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: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MSG_COMPOSER_ADDRESS_DIALOG_H__</div><div class='del'>-#define __E_MSG_COMPOSER_ADDRESS_DIALOG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade-xml.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_ADDRESS_DIALOG			(e_msg_composer_address_dialog_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_ADDRESS_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ADDRESS_DIALOG, EMsgComposerAddressDialog))</div><div class='del'>-#define E_MSG_COMPOSER_ADDRESS_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ADDRESS_DIALOG, EMsgComposerAddressDialogClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ADDRESS_DIALOG(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ADDRESS_DIALOG))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ADDRESS_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ADDRESS_DIALOG))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerAddressDialog       EMsgComposerAddressDialog;</div><div class='del'>-typedef struct _EMsgComposerAddressDialogClass  EMsgComposerAddressDialogClass;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAddressDialog {</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-</div><div class='del'>-	gchar *cut_buffer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAddressDialogClass {</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* apply) (EMsgComposerAddressDialog *dialog);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_msg_composer_address_dialog_get_type (void);</div><div class='del'>-GtkWidget *e_msg_composer_address_dialog_new (void);</div><div class='del'>-void e_msg_composer_address_dialog_construct (EMsgComposerAddressDialog *dialog);</div><div class='del'>-void e_msg_composer_address_dialog_set_to_list (EMsgComposerAddressDialog *dialog, GList *to_list);</div><div class='del'>-void e_msg_composer_address_dialog_set_cc_list (EMsgComposerAddressDialog *dialog, GList *cc_list);</div><div class='del'>-void e_msg_composer_address_dialog_set_bcc_list (EMsgComposerAddressDialog *dialog, GList *bcc_list);</div><div class='del'>-GList *e_msg_composer_address_dialog_get_to_list (EMsgComposerAddressDialog *dialog);</div><div class='del'>-GList *e_msg_composer_address_dialog_get_cc_list (EMsgComposerAddressDialog *dialog);</div><div class='del'>-GList *e_msg_composer_address_dialog_get_bcc_list (EMsgComposerAddressDialog *dialog);</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_ADDRESS_DIALOG_H__ */</div><div class='head'>diff --git a/composer/e-msg-composer-address-entry.c b/composer/e-msg-composer-address-entry.c<br/>deleted file mode 100644<br/>index ce946d203e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-address-entry.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-address-entry.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,175 +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-address-entry.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Helix Code, 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 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: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is a custom GtkEntry for entering address lists.  For now, it does not</div><div class='del'>-   have any fancy features, but in the future we might want to make it</div><div class='del'>-   cooler.  */</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer-address-entry.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkEntryClass *parent_class = NULL;</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 (EMsgComposerAddressEntryClass *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_entry_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposerAddressEntry *msg_composer_address_entry)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_address_entry_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'>-			"EMsgComposerAddressEntry",</div><div class='del'>-			sizeof (EMsgComposerAddressEntry),</div><div class='del'>-			sizeof (EMsgComposerAddressEntryClass),</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_entry_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'>-GtkWidget *</div><div class='del'>-e_msg_composer_address_entry_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *new;</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (e_msg_composer_address_entry_get_type ());</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_address_entry_get_addresses:</div><div class='del'>- * @entry: An address entry widget</div><div class='del'>- * </div><div class='del'>- * Retrieve the list of addresses stored in @entry.</div><div class='del'>- * </div><div class='del'>- * Return value: A GList of pointers to strings representing the addresses.</div><div class='del'>- * Notice that the strings must be freed by the caller when not needed anymore.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_address_entry_get_addresses (EMsgComposerAddressEntry *entry)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	const gchar *s;</div><div class='del'>-	const gchar *p, *oldp;</div><div class='del'>-	gboolean in_quotes;</div><div class='del'>-</div><div class='del'>-	s = gtk_entry_get_text (GTK_ENTRY (entry));</div><div class='del'>-</div><div class='del'>-	in_quotes = FALSE;</div><div class='del'>-	list = NULL;</div><div class='del'>-</div><div class='del'>-	p = s;</div><div class='del'>-	oldp = s;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (*p == '"') {</div><div class='del'>-			in_quotes = ! in_quotes;</div><div class='del'>-			p++;</div><div class='del'>-		} else if ((! in_quotes &amp;&amp; *p == ',') || *p == 0) {</div><div class='del'>-			if (p != oldp) {</div><div class='del'>-				gchar *new_addr;</div><div class='del'>-</div><div class='del'>-				new_addr = g_strndup (oldp, p - oldp);</div><div class='del'>-				new_addr = g_strstrip (new_addr);</div><div class='del'>-				if (*new_addr != '\0')</div><div class='del'>-					list = g_list_prepend (list, new_addr);</div><div class='del'>-				else</div><div class='del'>-					g_free (new_addr);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			while (*p == ',' || *p == ' ' || *p == '\t')</div><div class='del'>-				p++;</div><div class='del'>-</div><div class='del'>-			if (*p == 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			oldp = p;</div><div class='del'>-		} else {</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_list_reverse (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_address_entry_set_list:</div><div class='del'>- * @entry: An address entry</div><div class='del'>- * @list: List of pointers to strings representing the addresses that must</div><div class='del'>- * appear in the entry</div><div class='del'>- * </div><div class='del'>- * Set the address list from @list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_address_entry_set_list (EMsgComposerAddressEntry *entry,</div><div class='del'>-				       const GList *list)</div><div class='del'>-{</div><div class='del'>-	GString *string;</div><div class='del'>-	const GList *p;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (entry != NULL);</div><div class='del'>-</div><div class='del'>-	if (list == NULL) {</div><div class='del'>-		gtk_editable_delete_text (GTK_EDITABLE (entry), -1, -1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	string = g_string_new (NULL);</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next) {</div><div class='del'>-		if (string-&gt;str[0] != '\0')</div><div class='del'>-			g_string_append (string, ", ");</div><div class='del'>-		g_string_append (string, p-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (entry), string-&gt;str);</div><div class='del'>-	g_string_free (string, TRUE);</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-address-entry.h b/composer/e-msg-composer-address-entry.h<br/>deleted file mode 100644<br/>index f2b671bde4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-address-entry.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-address-entry.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +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-address-entry.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Helix Code, 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 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: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_MSG_COMPOSER_ADDRESS_ENTRY_H__</div><div class='del'>-#define __E_MSG_COMPOSER_ADDRESS_ENTRY_H__</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_MSG_COMPOSER_ADDRESS_ENTRY			(e_msg_composer_address_entry_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_ADDRESS_ENTRY(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ADDRESS_ENTRY, EMsgComposerAddressEntry))</div><div class='del'>-#define E_MSG_COMPOSER_ADDRESS_ENTRY_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ADDRESS_ENTRY, EMsgComposerAddressEntryClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ADDRESS_ENTRY(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ADDRESS_ENTRY))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ADDRESS_ENTRY_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ADDRESS_ENTRY))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerAddressEntry       EMsgComposerAddressEntry;</div><div class='del'>-typedef struct _EMsgComposerAddressEntryClass  EMsgComposerAddressEntryClass;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAddressEntry {</div><div class='del'>-	GtkEntry parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAddressEntryClass {</div><div class='del'>-	GtkEntryClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_msg_composer_address_entry_get_type      (void);</div><div class='del'>-GtkWidget *e_msg_composer_address_entry_new           (void);</div><div class='del'>-GList     *e_msg_composer_address_entry_get_addresses (EMsgComposerAddressEntry *entry);</div><div class='del'>-void	   e_msg_composer_address_entry_set_list      (EMsgComposerAddressEntry *entry,</div><div class='del'>-						       const 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'>-#endif /* __E_MSG_COMPOSER_ADDRESS_ENTRY_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 405104f608..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment-bar.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-attachment-bar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,653 +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  Helix Code, 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 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: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</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'>-#include "camel/camel-data-wrapper.h"</div><div class='del'>-#include "camel/camel-stream-fs.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 GnomeIconListClass *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'>-</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'>-	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 gchar *file_name)</div><div class='del'>-{</div><div class='del'>-	add_common (bar, e_msg_composer_attachment_new (file_name));</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 void</div><div class='del'>-update (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	GnomeIconList *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 = GNOME_ICON_LIST (bar);</div><div class='del'>-</div><div class='del'>-	gnome_icon_list_freeze (icon_list);</div><div class='del'>-</div><div class='del'>-	gnome_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'>-</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'>-		const gchar *icon_name, *desc;</div><div class='del'>-		gchar *size_string, *label, *mime_type;</div><div class='del'>-		GMimeContentField *content_type;</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'>-		mime_type = g_strdup_printf ("%s/%s", content_type-&gt;type,</div><div class='del'>-					     content_type-&gt;subtype);</div><div class='del'>-		icon_name = gnome_mime_get_value (mime_type, "icon-filename");</div><div class='del'>-		g_free (mime_type);</div><div class='del'>-</div><div class='del'>-		/* FIXME we need some better default icon.  */</div><div class='del'>-		if (icon_name == NULL)</div><div class='del'>-			icon_name = gnome_mime_get_value ("text/plain",</div><div class='del'>-							  "icon-filename");</div><div class='del'>-</div><div class='del'>-		desc = camel_mime_part_get_description (attachment-&gt;body);</div><div class='del'>-		if (!desc)</div><div class='del'>-			desc = camel_mime_part_get_filename (attachment-&gt;body);</div><div class='del'>-		if (!desc)</div><div class='del'>-			desc = "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'>-		gnome_icon_list_append (icon_list, icon_name, label);</div><div class='del'>-		g_free (label);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_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'>-	GnomeIconList *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 = GNOME_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'>-	for (p = icon_list-&gt;selection; 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'>-	GnomeIconList *icon_list;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	gint num;</div><div class='del'>-</div><div class='del'>-	icon_list = GNOME_ICON_LIST (bar);</div><div class='del'>-</div><div class='del'>-	num = GPOINTER_TO_INT (icon_list-&gt;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'>-attach_cb (GtkWidget *widget,</div><div class='del'>-	   gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *bar;</div><div class='del'>-	GtkWidget *file_selection;</div><div class='del'>-	const gchar *file_name;</div><div class='del'>-</div><div class='del'>-	file_selection = gtk_widget_get_toplevel (widget);</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);</div><div class='del'>-</div><div class='del'>-	file_name = gtk_file_selection_get_filename</div><div class='del'>-		                          (GTK_FILE_SELECTION (file_selection));</div><div class='del'>-	add_from_file (bar, file_name);</div><div class='del'>-</div><div class='del'>-	gtk_widget_hide (file_selection);</div><div class='del'>-}</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'>-	static GtkWidget *fs;</div><div class='del'>-</div><div class='del'>-	if (!fs) {</div><div class='del'>-		GtkWidget *cancel_button;</div><div class='del'>-		GtkWidget *ok_button;</div><div class='del'>-</div><div class='del'>-		fs = gtk_file_selection_new (_("Add attachment"));</div><div class='del'>-</div><div class='del'>-		ok_button = GTK_FILE_SELECTION (fs)-&gt;ok_button;</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (ok_button),</div><div class='del'>-				    "clicked", GTK_SIGNAL_FUNC (attach_cb),</div><div class='del'>-				    bar);</div><div class='del'>-</div><div class='del'>-		cancel_button = GTK_FILE_SELECTION (fs)-&gt;cancel_button;</div><div class='del'>-		gtk_signal_connect_object (GTK_OBJECT (cancel_button),</div><div class='del'>-					   "clicked",</div><div class='del'>-					   GTK_SIGNAL_FUNC (gtk_widget_hide),</div><div class='del'>-					   GTK_OBJECT (fs));</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (fs), "delete_event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (gtk_widget_hide), NULL);</div><div class='del'>-	} else</div><div class='del'>-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (fs), "");</div><div class='del'>-</div><div class='del'>-	gtk_window_set_position (GTK_WINDOW (fs), GTK_WIN_POS_MOUSE);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (fs));</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'>-	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'>-	GnomeIconList *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 = GNOME_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 = gnome_icon_list_get_icon_at (icon_list,</div><div class='del'>-						   event-&gt;x, event-&gt;y);</div><div class='del'>-</div><div class='del'>-	if (icon_number &gt;= 0) {</div><div class='del'>-		gnome_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'>-	GnomeIconListClass *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 = GNOME_ICON_LIST_CLASS (class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_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;</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'>-	icon_size += 24;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_usize (GTK_WIDGET (bar), icon_size * 4, icon_size);</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 (gnome_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'>-	GnomeIconList *icon_list;</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual (gdk_imlib_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_imlib_get_colormap ());</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 = GNOME_ICON_LIST (new);</div><div class='del'>-</div><div class='del'>-	gnome_icon_list_construct (icon_list, ICON_WIDTH, adj, 0);</div><div class='del'>-</div><div class='del'>-	gnome_icon_list_set_separators (icon_list, ICON_SEPARATORS);</div><div class='del'>-	gnome_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);</div><div class='del'>-	gnome_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);</div><div class='del'>-	gnome_icon_list_set_icon_border (icon_list, ICON_BORDER);</div><div class='del'>-	gnome_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);</div><div class='del'>-	gnome_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'>-</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'>-{</div><div class='del'>-	GMimeContentField *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'>-	/* Kludge a bit on CTE. For now, we set QP for text and B64</div><div class='del'>-	 * for all else except message (which must be 7bit, 8bit, or</div><div class='del'>-	 * binary). FIXME.</div><div class='del'>-	 */</div><div class='del'>-	if (!strcasecmp (content_type-&gt;type, "text")) {</div><div class='del'>-		camel_mime_part_set_encoding (attachment-&gt;body,</div><div class='del'>-					      CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE);</div><div class='del'>-	} else if (strcasecmp (content_type-&gt;type, "message") != 0) {</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'>-	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'>-{</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);</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);</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 1f331c2870..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment-bar.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-attachment-bar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +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  Helix Code, 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 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: 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 &lt;gnome.h&gt;</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'>-	GnomeIconList 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'>-	GnomeIconListClass 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'>-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 a0d7398c25..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-attachment.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,399 +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  Helix Code, 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 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: 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'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-</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'>-/* Utility functions.  */</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-get_mime_type (const gchar *file_name)</div><div class='del'>-{</div><div class='del'>-	const gchar *mime_type;</div><div class='del'>-</div><div class='del'>-	mime_type = gnome_mime_type_of_file (file_name);</div><div class='del'>-	if (mime_type == NULL)</div><div class='del'>-		mime_type = "application/octet-stream";</div><div class='del'>-</div><div class='del'>-	return mime_type;</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'>-	gtk_object_unref (GTK_OBJECT (attachment-&gt;body));</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'>-}</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: </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-EMsgComposerAttachment *</div><div class='del'>-e_msg_composer_attachment_new (const gchar *file_name)</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 *data;</div><div class='del'>-	struct stat statbuf;</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'>-	data = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);</div><div class='del'>-	if (!data)</div><div class='del'>-		return NULL;</div><div class='del'>-	wrapper = camel_data_wrapper_new ();</div><div class='del'>-	camel_data_wrapper_construct_from_stream (wrapper, data);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (data));</div><div class='del'>-	camel_data_wrapper_set_mime_type (wrapper, get_mime_type (file_name));</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'>-	gtk_object_unref (GTK_OBJECT (wrapper));</div><div class='del'>-</div><div class='del'>-	camel_mime_part_set_disposition (part, "attachment");</div><div class='del'>-	if (strchr (file_name, '/'))</div><div class='del'>-		camel_mime_part_set_filename (part, strrchr (file_name, '/') + 1);</div><div class='del'>-	else</div><div class='del'>-		camel_mime_part_set_filename (part, file_name);</div><div class='del'>-</div><div class='del'>-	new = e_msg_composer_attachment_new_from_mime_part (part);</div><div class='del'>-	if (stat (file_name, &amp;statbuf) &lt; 0)</div><div class='del'>-		new-&gt;size = 0;</div><div class='del'>-	else</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'>-	gtk_object_ref (GTK_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'>-	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'>-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'>-	const 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 = gtk_entry_get_text (data-&gt;file_name_entry);</div><div class='del'>-	mime_type = get_mime_type (file_name);</div><div class='del'>-</div><div class='del'>-	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'>-	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,</div><div class='del'>-	  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 (glade_xml_get_widget (attachment-&gt;editor_gui,</div><div class='del'>-						  "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,</div><div class='del'>-       gpointer data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	EMsgComposerAttachment *attachment;</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'>-	camel_mime_part_set_filename (attachment-&gt;body, gtk_entry_get_text</div><div class='del'>-				      (dialog_data-&gt;file_name_entry));</div><div class='del'>-</div><div class='del'>-	camel_mime_part_set_description (attachment-&gt;body, gtk_entry_get_text</div><div class='del'>-					 (dialog_data-&gt;description_entry));</div><div class='del'>-</div><div class='del'>-	camel_mime_part_set_content_type (attachment-&gt;body, gtk_entry_get_text</div><div class='del'>-					  (dialog_data-&gt;mime_type_entry));</div><div class='del'>-	camel_data_wrapper_set_mime_type (</div><div class='del'>-		camel_medium_get_content_object (CAMEL_MEDIUM (attachment-&gt;body)),</div><div class='del'>-		gtk_entry_get_text (dialog_data-&gt;mime_type_entry));</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 (glade_xml_get_widget</div><div class='del'>-						  (editor_gui,</div><div class='del'>-						   "file_name_entry"));</div><div class='del'>-	dialog_data-&gt;description_entry = GTK_ENTRY (glade_xml_get_widget</div><div class='del'>-						    (editor_gui,</div><div class='del'>-						     "description_entry"));</div><div class='del'>-	dialog_data-&gt;mime_type_entry = GTK_ENTRY (glade_xml_get_widget</div><div class='del'>-						  (editor_gui,</div><div class='del'>-						   "mime_type_entry"));</div><div class='del'>-</div><div class='del'>-	if (attachment != NULL) {</div><div class='del'>-		GMimeContentField *content_type;</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 = g_strdup_printf ("%s/%s", content_type-&gt;type,</div><div class='del'>-					content_type-&gt;subtype);</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'>-</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='head'>diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade<br/>deleted file mode 100644<br/>index a9717bef69..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.glade?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-attachment.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,258 +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_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-msg-composer-attachment.glade.h&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;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_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;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table1&lt;/name&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;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;label3&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;label1&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;label2&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'>-    &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.glade.h b/composer/e-msg-composer-attachment.glade.h<br/>deleted file mode 100644<br/>index 845aea9b32..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.glade.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-attachment.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Translatable strings file generated by Glade.</div><div class='del'>- * Add this file to your project's POTFILES.in.</div><div class='del'>- * DO NOT compile it as part of your application.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *s = N_("Attachment properties");</div><div class='del'>-gchar *s = N_("MIME type:");</div><div class='del'>-gchar *s = N_("Description:");</div><div class='del'>-gchar *s = N_("File name:");</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 e0cd2eb867..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-attachment.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +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  Helix Code, 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 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: 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;gnome.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'>-</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'>-</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 gchar *file_name);</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 a331511c0c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-hdrs.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-hdrs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,422 +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 Helix Code, 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 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: 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;gnome.h&gt;</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer-address-entry.h"</div><div class='del'>-#include "e-msg-composer-hdrs.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerHdrsPrivate {</div><div class='del'>-	/* Total number of headers that we have.  */</div><div class='del'>-	guint num_hdrs;</div><div class='del'>-</div><div class='del'>-	/* The tooltips.  */</div><div class='del'>-	GtkTooltips *tooltips;</div><div class='del'>-</div><div class='del'>-	/* Standard headers.  */</div><div class='del'>-	GtkWidget *to_entry;</div><div class='del'>-	GtkWidget *cc_entry;</div><div class='del'>-	GtkWidget *bcc_entry;</div><div class='del'>-	GtkWidget *subject_entry;</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'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint signals[LAST_SIGNAL];</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'>-	gtk_signal_emit (GTK_OBJECT (data), signals[SHOW_ADDRESS_DIALOG]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-add_header (EMsgComposerHdrs *hdrs,</div><div class='del'>-	    const gchar *name,</div><div class='del'>-	    const gchar *tip,</div><div class='del'>-	    const gchar *tip_private,</div><div class='del'>-	    gboolean addrbook_button)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	guint pad;</div><div class='del'>-</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (addrbook_button) {</div><div class='del'>-		label = gtk_button_new_with_label (name);</div><div class='del'>-		GTK_OBJECT_UNSET_FLAGS(label, GTK_CAN_FOCUS);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (label), "clicked",</div><div class='del'>-				    GTK_SIGNAL_FUNC (address_button_clicked_cb),</div><div class='del'>-				    hdrs);</div><div class='del'>-		pad = 2;</div><div class='del'>-		gtk_tooltips_set_tip (hdrs-&gt;priv-&gt;tooltips, label,</div><div class='del'>-				      _("Click here for the address book"),</div><div class='del'>-				      NULL);</div><div class='del'>-	} else {</div><div class='del'>-		label = gtk_label_new (name);</div><div class='del'>-		pad = GNOME_PAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (hdrs), label,</div><div class='del'>-			  0, 1, priv-&gt;num_hdrs, priv-&gt;num_hdrs + 1,</div><div class='del'>-			  GTK_FILL, GTK_FILL,</div><div class='del'>-			  pad, pad);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-</div><div class='del'>-	entry = e_msg_composer_address_entry_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (hdrs), entry,</div><div class='del'>-			  1, 2, priv-&gt;num_hdrs, priv-&gt;num_hdrs + 1,</div><div class='del'>-			  GTK_FILL | GTK_EXPAND, GTK_FILL,</div><div class='del'>-			  2, 2);</div><div class='del'>-	gtk_widget_show (entry);</div><div class='del'>-</div><div class='del'>-	gtk_tooltips_set_tip (hdrs-&gt;priv-&gt;tooltips, entry, tip, tip_private);</div><div class='del'>-</div><div class='del'>-	priv-&gt;num_hdrs++;</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'>-setup_headers (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;to_entry = add_header</div><div class='del'>-		(hdrs, _("To:"), </div><div class='del'>-		 _("Enter the recipients of the message"),</div><div class='del'>-		 NULL,</div><div class='del'>-		 TRUE);</div><div class='del'>-	priv-&gt;cc_entry = add_header</div><div class='del'>-		(hdrs, _("Cc:"),</div><div class='del'>-		 _("Enter the addresses that will receive a carbon copy of "</div><div class='del'>-		   "the message"),</div><div class='del'>-		 NULL,</div><div class='del'>-		 TRUE);</div><div class='del'>-	priv-&gt;bcc_entry = add_header</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'>-		 NULL,</div><div class='del'>-		 TRUE);</div><div class='del'>-	priv-&gt;subject_entry = add_header</div><div class='del'>-		(hdrs, _("Subject:"),</div><div class='del'>-		 _("Enter the subject of the mail"),</div><div class='del'>-		 NULL,</div><div class='del'>-		 FALSE);</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'>-</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'>-	gtk_object_destroy (GTK_OBJECT (priv-&gt;tooltips));</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'>-	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_new (EMsgComposerHdrsPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;to_entry = NULL;</div><div class='del'>-	priv-&gt;cc_entry = NULL;</div><div class='del'>-	priv-&gt;bcc_entry = NULL;</div><div class='del'>-	priv-&gt;subject_entry = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;tooltips = gtk_tooltips_new ();</div><div class='del'>-</div><div class='del'>-	priv-&gt;num_hdrs = 0;</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 (void)</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'>-	setup_headers (E_MSG_COMPOSER_HDRS (new));</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_recipients (CamelMimeMessage *msg,</div><div class='del'>-		GtkWidget *entry_widget,</div><div class='del'>-		const gchar *type)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressEntry *entry;</div><div class='del'>-	GList *list;</div><div class='del'>-	GList *p;</div><div class='del'>-	struct _header_address *addr;</div><div class='del'>-</div><div class='del'>-	entry = E_MSG_COMPOSER_ADDRESS_ENTRY (entry_widget);</div><div class='del'>-	list = e_msg_composer_address_entry_get_addresses (entry);</div><div class='del'>-</div><div class='del'>-	/* FIXME leak?  */</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next) {</div><div class='del'>-		addr = header_address_decode (p-&gt;data);</div><div class='del'>-		camel_mime_message_add_recipient (msg, type, addr-&gt;name,</div><div class='del'>-						  addr-&gt;v.addr);</div><div class='del'>-		header_address_unref (addr);</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'>-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'>-	const gchar *s;</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'>-	s = gtk_entry_get_text (GTK_ENTRY (hdrs-&gt;priv-&gt;subject_entry));</div><div class='del'>-	camel_mime_message_set_subject (msg, g_strdup (s));</div><div class='del'>-</div><div class='del'>-	set_recipients (msg, hdrs-&gt;priv-&gt;to_entry, CAMEL_RECIPIENT_TYPE_TO);</div><div class='del'>-	set_recipients (msg, hdrs-&gt;priv-&gt;cc_entry, CAMEL_RECIPIENT_TYPE_CC);</div><div class='del'>-	set_recipients (msg, hdrs-&gt;priv-&gt;bcc_entry, CAMEL_RECIPIENT_TYPE_BCC);</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_to (EMsgComposerHdrs *hdrs,</div><div class='del'>-			    const GList *to_list)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressEntry *entry;</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'>-	entry = E_MSG_COMPOSER_ADDRESS_ENTRY (hdrs-&gt;priv-&gt;to_entry);</div><div class='del'>-	e_msg_composer_address_entry_set_list (entry, to_list);</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'>-			    const GList *cc_list)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressEntry *entry;</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'>-	entry = E_MSG_COMPOSER_ADDRESS_ENTRY (hdrs-&gt;priv-&gt;cc_entry);</div><div class='del'>-	e_msg_composer_address_entry_set_list (entry, cc_list);</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'>-			     const GList *bcc_list)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressEntry *entry;</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'>-	entry = E_MSG_COMPOSER_ADDRESS_ENTRY (hdrs-&gt;priv-&gt;bcc_entry);</div><div class='del'>-	e_msg_composer_address_entry_set_list (entry, bcc_list);</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'>-	GtkEntry *entry;</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'>-	entry = GTK_ENTRY (hdrs-&gt;priv-&gt;subject_entry);</div><div class='del'>-	gtk_entry_set_text (entry, subject);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_hdrs_get_to (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 e_msg_composer_address_entry_get_addresses</div><div class='del'>-		(E_MSG_COMPOSER_ADDRESS_ENTRY (hdrs-&gt;priv-&gt;to_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_hdrs_get_cc (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 e_msg_composer_address_entry_get_addresses</div><div class='del'>-		(E_MSG_COMPOSER_ADDRESS_ENTRY (hdrs-&gt;priv-&gt;cc_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_msg_composer_hdrs_get_bcc (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 e_msg_composer_address_entry_get_addresses</div><div class='del'>-		(E_MSG_COMPOSER_ADDRESS_ENTRY (hdrs-&gt;priv-&gt;bcc_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_msg_composer_hdrs_get_subject (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 gtk_entry_get_text</div><div class='del'>-		(GTK_ENTRY (hdrs-&gt;priv-&gt;subject_entry));</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_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='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 d9c27b9527..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-hdrs.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-hdrs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +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 Helix Code, 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 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: 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;gnome.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 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'>-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'>-</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'>-</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                (void);</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_set_to             (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const GList      *to_list);</div><div class='del'>-void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const GList      *cc_list);</div><div class='del'>-void        e_msg_composer_hdrs_set_bcc            (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const GList      *bcc_list);</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'>-GList      *e_msg_composer_hdrs_get_to             (EMsgComposerHdrs *hdrs);</div><div class='del'>-GList      *e_msg_composer_hdrs_get_cc             (EMsgComposerHdrs *hdrs);</div><div class='del'>-GList      *e_msg_composer_hdrs_get_bcc            (EMsgComposerHdrs *hdrs);</div><div class='del'>-const char *e_msg_composer_hdrs_get_subject        (EMsgComposerHdrs *hdrs);</div><div class='del'>-</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'>-#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 0fd8a73418..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-select-file.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-select-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,169 +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 Helix Code, 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 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: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkfilesel.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer-select-file.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _FileSelectionInfo {</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	char *selected_file;</div><div class='del'>-};</div><div class='del'>-typedef struct _FileSelectionInfo FileSelectionInfo;</div><div class='del'>-</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'>-	const char *filename;</div><div class='del'>-</div><div class='del'>-	filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (info-&gt;widget));</div><div class='del'>-	info-&gt;selected_file = g_strdup (filename);</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_file == 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,</div><div class='del'>-	       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,</div><div class='del'>-		   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,</div><div class='del'>-		 GdkEventAny *event,</div><div class='del'>-		 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'>-</div><div class='del'>-/* Setup.  */</div><div class='del'>-</div><div class='del'>-static FileSelectionInfo *</div><div class='del'>-create_file_selection (EMsgComposer *composer)</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'>-</div><div class='del'>-	info = g_new (FileSelectionInfo, 1);</div><div class='del'>-</div><div class='del'>-	widget        = gtk_file_selection_new (NULL);</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'>-	info-&gt;widget        = widget;</div><div class='del'>-	info-&gt;selected_file = NULL;</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'>-</div><div class='del'>-	info = (FileSelectionInfo *) data;</div><div class='del'>-</div><div class='del'>-	g_free (info-&gt;selected_file);</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</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'>-	FileSelectionInfo *info;</div><div class='del'>-	char *retval;</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'>-	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);</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'>-	gtk_widget_show (info-&gt;widget);</div><div class='del'>-</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	retval = info-&gt;selected_file;</div><div class='del'>-	info-&gt;selected_file = NULL;</div><div class='del'>-</div><div class='del'>-	return retval;</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 2f89bd58b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-select-file.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer-select-file.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-msg-composer-select-file.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, 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 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: 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'>-#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 0832adeb81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1186 +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  Helix Code, 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 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: Ettore Perazzoli</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'>-*/</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;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-memory.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-html-utils.h"</div><div class='del'>-#include "e-util/e-setup.h"</div><div class='del'>-#include "e-util/e-gui-utils.h"</div><div class='del'>-#include "widgets/misc/e-scroll-frame.h"</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-#include "e-msg-composer-address-dialog.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'>-#ifdef USING_OAF</div><div class='del'>-#define HTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c"</div><div class='del'>-#else</div><div class='del'>-#define HTML_EDITOR_CONTROL_ID "control:html-editor"</div><div class='del'>-#endif</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'>-	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 GnomeAppClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_editor (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *control;</div><div class='del'>-</div><div class='del'>-	control = bonobo_widget_new_control (HTML_EDITOR_CONTROL_ID,</div><div class='del'>-					     bonobo_object_corba_objref (BONOBO_OBJECT (composer-&gt;uih)));</div><div class='del'>-	if (control == NULL) {</div><div class='del'>-		g_error ("Cannot get `%s'.", HTML_EDITOR_CONTROL_ID);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</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'>-free_string_list (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	if (list == NULL)</div><div class='del'>-		return;</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'>-static char *</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'>-	char *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)), format, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		/* FIXME. Some error message. */</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_malloc (stream_mem-&gt;pos + 1);</div><div class='del'>-	memcpy (text, stream_mem-&gt;buffer, stream_mem-&gt;pos);</div><div class='del'>-	text[stream_mem-&gt;pos] = 0;</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'>-/* This might be a temporary function... the GtkHTML export interfaces are</div><div class='del'>- * not yet complete, so some or all of this may move into GtkHTML.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-format_text (char *text)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	char *s, *space, *outstr;</div><div class='del'>-	int len, tabbing, i;</div><div class='del'>-	gboolean linestart = TRUE, cited = FALSE;</div><div class='del'>-</div><div class='del'>-	tabbing = 0;		/* Shut down compiler.  */</div><div class='del'>-	len = strlen (text);</div><div class='del'>-	out = g_string_sized_new (len + len / LINE_LEN);</div><div class='del'>-</div><div class='del'>-	s = text;</div><div class='del'>-	while (*s) {</div><div class='del'>-		if (linestart) {</div><div class='del'>-			tabbing = 0;</div><div class='del'>-			while (*s == '\t') {</div><div class='del'>-				s++;</div><div class='del'>-				tabbing++;</div><div class='del'>-			}</div><div class='del'>-			cited = (tabbing == 0 &amp;&amp; *s == '&gt;');</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len = strcspn (s, "\n");</div><div class='del'>-		if (!cited &amp;&amp; len &gt; LINE_LEN - tabbing * 8) {</div><div class='del'>-			/* If we can break anywhere between s and</div><div class='del'>-			 * s + LINE_LEN, do that. We can break between</div><div class='del'>-			 * space and anything but &amp;nbsp;</div><div class='del'>-			 */</div><div class='del'>-			space = s + LINE_LEN - tabbing * 8;</div><div class='del'>-			while (space &gt; s &amp;&amp; (*space != ' '</div><div class='del'>-					     || (*(space + 1) == '\240')</div><div class='del'>-					     || (*(space - 1) == '\240')))</div><div class='del'>-				space--;</div><div class='del'>-</div><div class='del'>-			if (space != s)</div><div class='del'>-				len = space - s;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Do initial tabs */</div><div class='del'>-		for (i = 0; i &lt; tabbing; i++)</div><div class='del'>-			g_string_append_c (out, '\t');</div><div class='del'>-</div><div class='del'>-		/* Copy the line... */</div><div class='del'>-		while (len--) {</div><div class='del'>-			g_string_append_c (out, *s == '\240' ? ' ' : *s);</div><div class='del'>-			s++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Eat whitespace... */</div><div class='del'>-		while (*s == ' ' || *s == '\240')</div><div class='del'>-			s++;</div><div class='del'>-		if (*s == '\n') {</div><div class='del'>-			s++;</div><div class='del'>-			linestart = TRUE;</div><div class='del'>-		} else</div><div class='del'>-			linestart = FALSE;</div><div class='del'>-</div><div class='del'>-		/* And end the line. */</div><div class='del'>-		g_string_append_c (out, '\n');</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'>-	return outstr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	MSG_FORMAT_PLAIN,</div><div class='del'>-	MSG_FORMAT_ALTERNATIVE,</div><div class='del'>-} MsgFormat;</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'>-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'>-	CamelMimeMessage *new;</div><div class='del'>-	CamelMultipart *body = NULL;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	char *html = NULL, *plain = NULL, *fmt = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	char *string;</div><div class='del'>-	MsgFormat type = MSG_FORMAT_ALTERNATIVE;</div><div class='del'>-	char *path;</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'>-	path = g_strdup_printf ("=%s/config=/mail/msg_format", evolution_dir);</div><div class='del'>-	string = gnome_config_get_string (path);</div><div class='del'>-	g_free (path);</div><div class='del'>-	if (string) {</div><div class='del'>-		if (!strcasecmp(string, "plain"))</div><div class='del'>-			type = MSG_FORMAT_PLAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new = camel_mime_message_new ();</div><div class='del'>-</div><div class='del'>-	e_msg_composer_hdrs_to_message (E_MSG_COMPOSER_HDRS (composer-&gt;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'>-	plain = get_text (composer-&gt;persist_stream_interface, "text/plain");</div><div class='del'>-	fmt = format_text (plain);</div><div class='del'>-	g_free (plain);</div><div class='del'>-	</div><div class='del'>-	if (type != MSG_FORMAT_PLAIN)</div><div class='del'>-		html = get_text (composer-&gt;persist_stream_interface, "text/html");</div><div class='del'>-</div><div class='del'>-	if (type == MSG_FORMAT_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_mime_part_set_content (part, fmt, strlen (fmt), "text/plain");</div><div class='del'>-		g_free (fmt);</div><div class='del'>-		camel_multipart_add_part (body, part);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-		</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_mime_part_set_content (part, html, strlen (html), "text/html");</div><div class='del'>-		g_free (html);</div><div class='del'>-		camel_multipart_add_part (body, part);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-	}</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'>-		/* 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'>-		switch (type) {</div><div class='del'>-		case MSG_FORMAT_ALTERNATIVE:</div><div class='del'>-			camel_medium_set_content_object (CAMEL_MEDIUM (part),</div><div class='del'>-							 CAMEL_DATA_WRAPPER (body));</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (body));</div><div class='del'>-			break;</div><div class='del'>-		case MSG_FORMAT_PLAIN:</div><div class='del'>-			camel_mime_part_set_content (part, fmt, strlen (fmt), "text/plain");</div><div class='del'>-			g_free(fmt);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		camel_multipart_add_part (multipart, part);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-</div><div class='del'>-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart);</div><div class='del'>-</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (multipart));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (multipart));</div><div class='del'>-	} else {</div><div class='del'>-		CamelDataWrapper *cdw;</div><div class='del'>-		CamelStream *stream;</div><div class='del'>-		switch (type) {</div><div class='del'>-		case MSG_FORMAT_ALTERNATIVE:</div><div class='del'>-			camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (body));</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (body));</div><div class='del'>-			break;</div><div class='del'>-		case MSG_FORMAT_PLAIN:</div><div class='del'>-			stream = camel_stream_mem_new_with_buffer (fmt, strlen (fmt));</div><div class='del'>-			cdw = camel_data_wrapper_new ();</div><div class='del'>-			camel_data_wrapper_construct_from_stream (cdw, stream);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (stream));</div><div class='del'>-			</div><div class='del'>-			camel_data_wrapper_set_mime_type (cdw, "text/plain");</div><div class='del'>-</div><div class='del'>-			camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (cdw));</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (cdw));</div><div class='del'>-			g_free (fmt);</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 new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_signature ()</div><div class='del'>-{</div><div class='del'>-	char *path, *sigfile, *rawsig;</div><div class='del'>-	static char *htmlsig = NULL;</div><div class='del'>-	static time_t sigmodtime = -1;</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/config=/mail/id_sig", evolution_dir);</div><div class='del'>-	sigfile = gnome_config_get_string (path);</div><div class='del'>-	g_free (path);</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'>-	if (stat (sigfile, &amp;st) == -1) {</div><div class='del'>-		char *msg;</div><div class='del'>-</div><div class='del'>-		msg = g_strdup_printf ("Could not open signature file %s:\n%s",</div><div class='del'>-				       sigfile, 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 NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (st.st_mtime == sigmodtime)</div><div class='del'>-		return htmlsig;</div><div class='del'>-</div><div class='del'>-	rawsig = g_malloc (st.st_size + 1);</div><div class='del'>-	fd = open (sigfile, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		char *msg;</div><div class='del'>-</div><div class='del'>-		msg = g_strdup_printf ("Could not open signature file %s:\n%s",</div><div class='del'>-				       sigfile, 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 NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	read (fd, rawsig, st.st_size);</div><div class='del'>-	rawsig[st.st_size] = '\0';</div><div class='del'>-	close (fd);</div><div class='del'>-</div><div class='del'>-	htmlsig = e_text_to_html (rawsig, 0);</div><div class='del'>-	sigmodtime = st.st_mtime;</div><div class='del'>-</div><div class='del'>-	return htmlsig;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_editor_text (BonoboWidget *editor, const char *text)</div><div class='del'>-{</div><div class='del'>-	Bonobo_PersistStream persist;</div><div class='del'>-	BonoboStream *stream;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *sig, *fulltext;</div><div class='del'>-</div><div class='del'>-	sig = get_signature ();</div><div class='del'>-	if (sig) {</div><div class='del'>-		fulltext = g_strdup_printf ("%s&lt;BR&gt;\n&lt;PRE&gt;\n--\n%s&lt;PRE&gt;",</div><div class='del'>-					    text, sig);</div><div class='del'>-	} else</div><div class='del'>-		fulltext = (char*)text;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	persist = (Bonobo_PersistStream)</div><div class='del'>-		bonobo_object_client_query_interface (</div><div class='del'>-			bonobo_widget_get_server (editor),</div><div class='del'>-			"IDL:Bonobo/PersistStream:1.0",</div><div class='del'>-			&amp;ev);</div><div class='del'>-	g_assert (persist != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	stream = bonobo_stream_mem_create (fulltext, strlen (fulltext),</div><div class='del'>-					   TRUE, FALSE);</div><div class='del'>-	if (sig)</div><div class='del'>-		g_free (fulltext);</div><div class='del'>-	Bonobo_PersistStream_load (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)), "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'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (ev._major != CORBA_SYSTEM_EXCEPTION)</div><div class='del'>-		CORBA_Object_release (persist, &amp;ev);</div><div class='del'>-</div><div class='del'>-	Bonobo_Unknown_unref (persist, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT(stream));</div><div class='del'>-}</div><div class='del'>-</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'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_check_menu_item_set_active</div><div class='del'>-		(GTK_CHECK_MENU_ITEM</div><div class='del'>-		 (glade_xml_get_widget (composer-&gt;menubar_gui,</div><div class='del'>-					"menu_view_attachments")),</div><div class='del'>-		 show);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* XXX we should update the toggle toolbar item as well.  At</div><div class='del'>-	   this point, it is not a toggle because Glade is broken.  */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Address dialog callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_dialog_destroy_cb (GtkWidget *widget,</div><div class='del'>-			   gpointer 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'>-	composer-&gt;address_dialog = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_dialog_apply_cb (EMsgComposerAddressDialog *dialog,</div><div class='del'>-			 gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (E_MSG_COMPOSER (data)-&gt;hdrs);</div><div class='del'>-</div><div class='del'>-	list = e_msg_composer_address_dialog_get_to_list (dialog);</div><div class='del'>-	e_msg_composer_hdrs_set_to (hdrs, list);</div><div class='del'>-</div><div class='del'>-	list = e_msg_composer_address_dialog_get_cc_list (dialog);</div><div class='del'>-	e_msg_composer_hdrs_set_cc (hdrs, list);</div><div class='del'>-</div><div class='del'>-	list = e_msg_composer_address_dialog_get_bcc_list (dialog);</div><div class='del'>-	e_msg_composer_hdrs_set_bcc (hdrs, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Message composer window callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-open_cb (GtkWidget *widget,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	CORBA_Environment ev;</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'>-	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'>-	g_free (file_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_cb (GtkWidget *widget,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as_cb (GtkWidget *widget,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_cb (GtkWidget *widget,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-exit_dialog_cb (int reply, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (reply == 0)</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-exit_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer = E_MSG_COMPOSER (data);</div><div class='del'>-	GtkWindow *parent =</div><div class='del'>-		GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (data),</div><div class='del'>-						     GTK_TYPE_WINDOW));</div><div class='del'>-</div><div class='del'>-	gnome_ok_cancel_dialog_parented (_("Discard this message?"),</div><div class='del'>-					 exit_dialog_cb, composer, parent);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-menu_view_attachments_activate_cb (GtkWidget *widget,</div><div class='del'>-				   gpointer data)</div><div class='del'>-{</div><div class='del'>-	e_msg_composer_show_attachments (E_MSG_COMPOSER (data),</div><div class='del'>-					 GTK_CHECK_MENU_ITEM (widget)-&gt;active);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-toolbar_view_attachments_clicked_cb (GtkWidget *widget,</div><div class='del'>-				      gpointer 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'>-	e_msg_composer_show_attachments (composer,</div><div class='del'>-					 ! composer-&gt;attachment_bar_visible);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_attachment_cb (GtkWidget *widget,</div><div class='del'>-		   gpointer 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'>-	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'>-/* Create the address dialog if not created already.  */</div><div class='del'>-static void</div><div class='del'>-setup_address_dialog (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAddressDialog *dialog;</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;address_dialog != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	composer-&gt;address_dialog = e_msg_composer_address_dialog_new ();</div><div class='del'>-	dialog = E_MSG_COMPOSER_ADDRESS_DIALOG (composer-&gt;address_dialog);</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog),</div><div class='del'>-			    "destroy", address_dialog_destroy_cb, composer);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog),</div><div class='del'>-			    "apply", address_dialog_apply_cb, composer);</div><div class='del'>-</div><div class='del'>-	list = e_msg_composer_hdrs_get_to (hdrs);</div><div class='del'>-	e_msg_composer_address_dialog_set_to_list (dialog, list);</div><div class='del'>-</div><div class='del'>-	list = e_msg_composer_hdrs_get_cc (hdrs);</div><div class='del'>-	e_msg_composer_address_dialog_set_cc_list (dialog, list);</div><div class='del'>-</div><div class='del'>-	list = e_msg_composer_hdrs_get_bcc (hdrs);</div><div class='del'>-	e_msg_composer_address_dialog_set_bcc_list (dialog, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_dialog_cb (GtkWidget *widget,</div><div class='del'>-		   gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-</div><div class='del'>-	/* FIXME maybe we should hide the dialog on Cancel/OK instead of</div><div class='del'>-           destroying it.  */</div><div class='del'>-</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-</div><div class='del'>-	setup_address_dialog (composer);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (composer-&gt;address_dialog);</div><div class='del'>-	gdk_window_show (composer-&gt;address_dialog-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,</div><div class='del'>-			   gpointer 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 (e_msg_composer_attachment_bar_get_num_attachments (bar) &gt; 0)</div><div class='del'>-		e_msg_composer_show_attachments (composer, TRUE);</div><div class='del'>-	else</div><div class='del'>-		e_msg_composer_show_attachments (composer, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Menu bar implementation.  */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo file_tree[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_OPEN_ITEM (open_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_ITEM (save_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (save_as_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_ITEM_NONE (N_("Save in _folder..."), N_("Save the message in a specified folder"),</div><div class='del'>-			       NULL),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Send"), N_("Send the message"),</div><div class='del'>-				send_cb, GNOME_STOCK_MENU_MAIL_SND),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_MENU_EXIT_ITEM (exit_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo view_tree[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("View _attachments"), N_("View/hide attachments"),</div><div class='del'>-				menu_view_attachments_activate_cb, GNOME_STOCK_MENU_ATTACH),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo menubar_info[] = {</div><div class='del'>-	GNOMEUIINFO_MENU_FILE_TREE (file_tree),</div><div class='del'>-	GNOMEUIINFO_MENU_VIEW_TREE (view_tree),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_menubar (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandler *uih;</div><div class='del'>-	BonoboUIHandlerMenuItem *list;</div><div class='del'>-</div><div class='del'>-	uih = composer-&gt;uih;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_menubar (uih);</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (menubar_info, composer);</div><div class='del'>-	bonobo_ui_handler_menu_add_list (uih, "/", list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Toolbar implementation.  */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo toolbar_info[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Send"), N_("Send this message"), send_cb, GNOME_STOCK_PIXMAP_MAIL_SND),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Cut"), N_("Cut selected region into the clipboard"), NULL, GNOME_STOCK_PIXMAP_CUT),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Copy"), N_("Copy selected region into the clipboard"), NULL, GNOME_STOCK_PIXMAP_COPY),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Paste"), N_("Paste selected region into the clipboard"), NULL, GNOME_STOCK_PIXMAP_PASTE),</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Undo"), N_("Undo last operation"), NULL, GNOME_STOCK_PIXMAP_UNDO),</div><div class='del'>-	GNOMEUIINFO_SEPARATOR,</div><div class='del'>-	GNOMEUIINFO_ITEM_STOCK (N_("Attach"), N_("Attach a file"), add_attachment_cb, GNOME_STOCK_PIXMAP_ATTACH),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_toolbar (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	BonoboUIHandler *uih;</div><div class='del'>-	BonoboUIHandlerToolbarItem *list;</div><div class='del'>-</div><div class='del'>-	uih = composer-&gt;uih;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_handler_create_toolbar (uih, "Toolbar");</div><div class='del'>-</div><div class='del'>-	list = bonobo_ui_handler_toolbar_parse_uiinfo_list_with_data (toolbar_info, composer);</div><div class='del'>-	bonobo_ui_handler_toolbar_add_list (uih, "/Toolbar", list);</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'>-	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'>-	bonobo_object_unref (BONOBO_OBJECT (composer-&gt;uih));</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'>-	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'>-	CORBA_exception_free (&amp;ev);</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 (EMsgComposerClass *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'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_app_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'>-	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;uih                      = 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'>-</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 (gnome_app_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_construct:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Construct @composer.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_construct (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	BonoboObject *editor_server;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gtk_main_level () &gt; 0);</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'>-</div><div class='del'>-	gnome_app_construct (GNOME_APP (composer), "e-msg-composer",</div><div class='del'>-			     _("Compose a message"));</div><div class='del'>-</div><div class='del'>-	composer-&gt;uih = bonobo_ui_handler_new ();</div><div class='del'>-	bonobo_ui_handler_set_app (composer-&gt;uih, GNOME_APP (composer));</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-</div><div class='del'>-	composer-&gt;hdrs = e_msg_composer_hdrs_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), composer-&gt;hdrs, FALSE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (composer-&gt;hdrs);</div><div class='del'>-</div><div class='del'>-	/* Editor component.  */</div><div class='del'>-</div><div class='del'>-	create_menubar (composer);</div><div class='del'>-	create_toolbar (composer);</div><div class='del'>-	composer-&gt;editor = create_editor (composer);</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_widget_show (composer-&gt;editor);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), composer-&gt;editor, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (composer-&gt;editor);</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, TRUE, 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'>-	gnome_app_set_contents (GNOME_APP (composer), vbox);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-</div><div class='del'>-	e_msg_composer_show_attachments (composer, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Set focus on the `To:' field.  */</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs)));</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.  This function must be called</div><div class='del'>- * within the GTK+ main loop, or it will fail.</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'>-GtkWidget *</div><div class='del'>-e_msg_composer_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *new;</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 = gtk_type_new (e_msg_composer_get_type ());</div><div class='del'>-	e_msg_composer_construct (E_MSG_COMPOSER (new));</div><div class='del'>-</div><div class='del'>-	/* Load the signature, if any. */</div><div class='del'>-	set_editor_text (BONOBO_WIDGET (E_MSG_COMPOSER (new)-&gt;editor), "");</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 GList *</div><div class='del'>-add_recipients (GList *list, const char *recips, gboolean decode)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-	char *addr;</div><div class='del'>-</div><div class='del'>-	while (*recips) {</div><div class='del'>-		len = strcspn (recips, ",");</div><div class='del'>-		if (len) {</div><div class='del'>-			addr = g_strndup (recips, len);</div><div class='del'>-			if (decode)</div><div class='del'>-				camel_url_decode (addr);</div><div class='del'>-			list = g_list_append (list, addr);</div><div class='del'>-		}</div><div class='del'>-		recips += len;</div><div class='del'>-		if (*recips == ',')</div><div class='del'>-			recips++;</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'>-free_recipients (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'>-		g_free (l-&gt;data);</div><div class='del'>-	g_list_free (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'>-GtkWidget *</div><div class='del'>-e_msg_composer_new_from_url (const char *url)</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'>-	char *subject = NULL, *body = NULL;</div><div class='del'>-	const char *p, *header;</div><div class='del'>-	int len, clen;</div><div class='del'>-	char *content;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (strncasecmp (url, "mailto:", 7) == 0, NULL);</div><div class='del'>-</div><div class='del'>-	/* Parse recipients (everything after ':' until '?' or eos. */</div><div class='del'>-	p = url + 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'>-		to = add_recipients (to, content, TRUE);</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'>-			content = g_strndup (p, clen);</div><div class='del'>-			camel_url_decode (content);</div><div class='del'>-</div><div class='del'>-			if (!strncasecmp (header, "to", len))</div><div class='del'>-				to = add_recipients (to, content, FALSE);</div><div class='del'>-			else if (!strncasecmp (header, "cc", len))</div><div class='del'>-				cc = add_recipients (cc, content, FALSE);</div><div class='del'>-			else if (!strncasecmp (header, "bcc", len))</div><div class='del'>-				bcc = add_recipients (bcc, content, FALSE);</div><div class='del'>-			else if (!strncasecmp (header, "subject", len))</div><div class='del'>-				subject = g_strdup (content);</div><div class='del'>-			else if (!strncasecmp (header, "body", len))</div><div class='del'>-				body = g_strdup (content);</div><div class='del'>-</div><div class='del'>-			g_free (content);</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'>-	composer = E_MSG_COMPOSER (e_msg_composer_new ());</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs);</div><div class='del'>-	e_msg_composer_hdrs_set_to (hdrs, to);</div><div class='del'>-	free_recipients (to);</div><div class='del'>-	e_msg_composer_hdrs_set_cc (hdrs, cc);</div><div class='del'>-	free_recipients (cc);</div><div class='del'>-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);</div><div class='del'>-	free_recipients (bcc);</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 = e_text_to_html (body, E_TEXT_TO_HTML_PRE);</div><div class='del'>-		set_editor_text (BONOBO_WIDGET (composer-&gt;editor), htmlbody);</div><div class='del'>-		g_free (htmlbody);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (composer);</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_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'>-/**</div><div class='del'>- * e_msg_composer_set_headers:</div><div class='del'>- * @composer: a composer object</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, const GList *to,</div><div class='del'>-			    const GList *cc, const GList *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_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 (BONOBO_WIDGET (composer-&gt;editor), text);</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_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 (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'>-	return build_message (composer);</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 a8abf611dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer.h?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/e-msg-composer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +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  Helix Code, 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 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: 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'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.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'>-</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'>-typedef struct _EMsgComposer       EMsgComposer;</div><div class='del'>-typedef struct _EMsgComposerClass  EMsgComposerClass;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposer {</div><div class='del'>-	GnomeApp parent;</div><div class='del'>-</div><div class='del'>-	BonoboUIHandler *uih;</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'>-</div><div class='del'>-	gboolean attachment_bar_visible : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerClass {</div><div class='del'>-	GnomeAppClass 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'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType           e_msg_composer_get_type          (void);</div><div class='del'>-</div><div class='del'>-void              e_msg_composer_construct         (EMsgComposer *composer);</div><div class='del'>-GtkWidget        *e_msg_composer_new               (void);</div><div class='del'>-GtkWidget        *e_msg_composer_new_from_url      (const char *url);</div><div class='del'>-void              e_msg_composer_show_attachments  (EMsgComposer *composer,</div><div class='del'>-						    gboolean      show);</div><div class='del'>-</div><div class='del'>-void              e_msg_composer_set_headers       (EMsgComposer *composer,</div><div class='del'>-						    const GList *to,</div><div class='del'>-						    const GList *cc,</div><div class='del'>-						    const GList *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_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'>-</div><div class='del'>-CamelMimeMessage *e_msg_composer_get_message       (EMsgComposer *composer);</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_H__ */</div><div class='head'>diff --git a/composer/main.c b/composer/main.c<br/>deleted file mode 100644<br/>index 9a29e95666..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/main.c?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>composer/main.c</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'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;bonobo.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;camel/camel-data-wrapper.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_cb (EMsgComposer *composer,</div><div class='del'>-	 gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	gint stdout_dup;</div><div class='del'>-</div><div class='del'>-	message = e_msg_composer_get_message (composer);</div><div class='del'>-</div><div class='del'>-	stdout_dup = dup (1);</div><div class='del'>-	stream = camel_stream_fs_new_with_fd (stdout_dup);</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),</div><div class='del'>-					    stream);</div><div class='del'>-	camel_stream_close (stream);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (message));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (composer));</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-create_composer (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *composer;</div><div class='del'>-</div><div class='del'>-	composer = e_msg_composer_new ();</div><div class='del'>-	gtk_widget_show (composer);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer), "send", GTK_SIGNAL_FUNC (send_cb), NULL);</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'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	gnome_CORBA_init ("evolution-test-msg-composer", "0.0", &amp;argc, argv, 0, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	orb = gnome_CORBA_ORB ();</div><div class='del'>-</div><div class='del'>-	glade_gnome_init ();</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\n");</div><div class='del'>-</div><div class='del'>-	/* We can't make any CORBA calls unless we're in the main loop.  So we</div><div class='del'>-	   delay creating the container here. */</div><div class='del'>-	gtk_idle_add ((GtkFunction) create_composer, 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/configure.in b/configure.in<br/>deleted file mode 100644<br/>index 28dfd9fcf2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/configure.in?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>configure.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,499 +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'>-cflags_set=${CFLAGS+set}</div><div class='del'>-</div><div class='del'>-EVOLUTION_MAJOR_VERSION=0</div><div class='del'>-EVOLUTION_MINOR_VERSION=0</div><div class='del'>-EVOLUTION_MICRO_VERSION=1</div><div class='del'>-VERSION=$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_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'>-</div><div class='del'>-dnl Initialize libtool</div><div class='del'>-AM_PROG_LIBTOOL</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_CANONICAL_HOST</div><div class='del'>-</div><div class='del'>-AM_ACLOCAL_INCLUDE(macros)</div><div class='del'>-GNOME_INIT(capplet)</div><div class='del'>-GNOME_COMPILE_WARNINGS</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'>-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'>-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; 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_MSG_RESULT($system_mail_dir)</div><div class='del'>-AC_DEFINE_UNQUOTED(SYSTEM_MAIL_DIR, "$system_mail_dir")</div><div class='del'>-</div><div class='del'>-dnl Check for new enough gnome-libs</div><div class='del'>-CFLAGS_save=$CFLAGS</div><div class='del'>-LIBS_save=$LIBS</div><div class='del'>-CFLAGS=`gnome-config --cflags gnomeui`</div><div class='del'>-LIBS=`gnome-config --libs gnomeui`</div><div class='del'>-</div><div class='del'>-AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[</div><div class='del'>-AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)])</div><div class='del'>-</div><div class='del'>-CFLAGS=$CFLAGS_save</div><div class='del'>-LIBS=$LIBS_save</div><div class='del'>-</div><div class='del'>-ALL_LINGUAS="da de el fr gl hu it ja ko nl no ru sl sv tr uk es pl"</div><div class='del'>-</div><div class='del'>-AM_GNOME_GETTEXT</div><div class='del'>-</div><div class='del'>-GNOME_X_CHECKS</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'>-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)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * pas-backend-file stuff.</div><div class='del'>-dnl * check for db_185.h.  if it's there, we use it.</div><div class='del'>-dnl * otherwise, we use db.h (since it'll be 185).</div><div class='del'>-dnl **************************************************</div><div class='del'>-AC_CHECK_HEADERS(db_185.h)</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_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="-llber")</div><div class='del'>-if test x$ac_cv_lib_lber_ber_get_tag = xyes; then</div><div class='del'>-AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS", ,-llber)</div><div class='del'>-fi</div><div class='del'>-if test x$ac_cv_lib_ldap_ldap_open = xyes; then</div><div class='del'>-	AC_DEFINE(HAVE_LDAP)</div><div class='del'>-	AC_SUBST(LDAP_LIBS)</div><div class='del'>-else</div><div class='del'>-	AC_MSG_WARN(no ldap support present)</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(ENABLE_LDAP, test x$ac_cv_lib_ldap_ldap_open = 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'>-have_pthread=false</div><div class='del'>-</div><div class='del'>-AC_ARG_WITH(threads, [  --with-threads          Include thread support],[</div><div class='del'>-        if test x$withval = xyes; then</div><div class='del'>-              test_thread=true</div><div class='del'>-        else</div><div class='del'>-              test_thread=false</div><div class='del'>-	fi</div><div class='del'>-],[</div><div class='del'>-	test_thread=false</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-if $test_thread; then</div><div class='del'>-     GNOME_PTHREAD_CHECK</div><div class='del'>-     if test "x$PTHREAD_LIB" = "x" ; then</div><div class='del'>-         have_pthread=false</div><div class='del'>-     else</div><div class='del'>-         have_pthread=true</div><div class='del'>-     fi</div><div class='del'>-else</div><div class='del'>-     have_pthread=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AM_CONDITIONAL(ENABLE_THREADS, $have_pthread)</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'>-if $have_pthread; then </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'>-else</div><div class='del'>-	THREADS_LIBS=""</div><div class='del'>-	THREADS_CFLAGS=""</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * Print check</div><div class='del'>-dnl **************************************************</div><div class='del'>-AC_MSG_CHECKING(for GnomePrint libraries &gt;= 0.13)</div><div class='del'>-if gnome-config --libs print &gt; /dev/null 2&gt;&amp;1; then </div><div class='del'>-    vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" | \</div><div class='del'>-        awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`</div><div class='del'>-    if test "$vers" -ge 13; then</div><div class='del'>-        AC_MSG_RESULT(found)</div><div class='del'>-    else</div><div class='del'>-        AC_MSG_ERROR(You need at least GNOME print 0.13)</div><div class='del'>-    fi</div><div class='del'>-else</div><div class='del'>-    AC_MSG_ERROR(Did not find GnomePrint installed)</div><div class='del'>-fi</div><div class='del'>-GNOME_PRINT_LIBS=`gnome-config --libs print`</div><div class='del'>-GNOME_PRINT_CFLAGS=`gnome-config --cflags print`</div><div class='del'>-AC_SUBST(GNOME_PRINT_LIBS)</div><div class='del'>-AC_SUBST(GNOME_PRINT_CFLAGS)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * ORBit support</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl GNOMEGNORBA_LIBS="$GNOMEGNORBA_LIBS"</div><div class='del'>-dnl AC_SUBST(GNOMEGNORBA_LIBS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl Check for Bonobo</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(for Bonobo &gt;= 0.10)</div><div class='del'>-if gnome-config --libs bonobo &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-	vers=`gnome-config --modversion bonobo`</div><div class='del'>-	case $vers</div><div class='del'>-	in</div><div class='del'>-	    bonobo-0.?) bonobo_ok=false ;;</div><div class='del'>-	    *) bonobo_ok=true ;;</div><div class='del'>-	esac</div><div class='del'>-else</div><div class='del'>-	bonobo_ok=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if $bonobo_ok; then</div><div class='del'>-	AC_MSG_RESULT($vers found)</div><div class='del'>-else</div><div class='del'>-	AC_MSG_ERROR(Bonobo 0.10 is required to compile Evolution)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl LibGlade checking</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(For Glade libraries)</div><div class='del'>-if gnome-config --libs libglade &gt; /dev/null 2&gt;&amp;1; then </div><div class='del'>-    AC_MSG_RESULT(found)</div><div class='del'>-else</div><div class='del'>-    AC_MSG_ERROR(Did not find libGlade installed)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl libunicode checking</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(For libunicode)</div><div class='del'>-if unicode-config --libs &gt; /dev/null 2&gt;&amp;1; then </div><div class='del'>-    UNICODE_LIBS=`unicode-config --libs`</div><div class='del'>-    UNICODE_CFLAGS=`unicode-config --cflags`</div><div class='del'>-    AC_SUBST(UNICODE_LIBS)</div><div class='del'>-    AC_SUBST(UNICODE_CFLAGS)</div><div class='del'>-    AC_MSG_RESULT(found)</div><div class='del'>-else</div><div class='del'>-    AC_MSG_ERROR(libunicode not found)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl GdkPixbuf checking</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(For Gdkpixbuf libraries)</div><div class='del'>-if gnome-config --libs gdk_pixbuf gnomecanvaspixbuf &gt; /dev/null 2&gt;&amp;1; then </div><div class='del'>-    AC_MSG_RESULT(found)</div><div class='del'>-else</div><div class='del'>-    AC_MSG_ERROR(Did not find gdkpixbuf installed)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-GLIB_CFLAGS="`glib-config --cflags`"</div><div class='del'>-GLIB_LIBS="`glib-config --libs`"</div><div class='del'>-</div><div class='del'>-AC_SUBST(GLIB_CFLAGS)</div><div class='del'>-AC_SUBST(GLIB_LIBS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $THREADS_LIBS `unicode-config --libs`"</div><div class='del'>-EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $THREADS_CFLAGS `unicode-config --cflags`"</div><div class='del'>-</div><div class='del'>-AC_SUBST(EXTRA_GNOME_LIBS)</div><div class='del'>-AC_SUBST(EXTRA_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BONOBO_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui`"</div><div class='del'>-BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui `"</div><div class='del'>-AC_SUBST(BONOBO_GNOME_LIBS)</div><div class='del'>-AC_SUBST(BONOBO_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS"</div><div class='del'>-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS"</div><div class='del'>-AC_SUBST(BONOBO_HTML_GNOME_LIBS)</div><div class='del'>-AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl GtkHTML checking</div><div class='del'>-dnl ******************************</div><div class='del'>-</div><div class='del'>-AC_MSG_CHECKING(for GtkHTML)</div><div class='del'>-if gnome-config --libs gtkhtml &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-	vers=`gnome-config --modversion gtkhtml`</div><div class='del'>-	case $vers</div><div class='del'>-	in</div><div class='del'>-	    gtkhtml-0.1) gtkhtml_ok=false ;;</div><div class='del'>-	    *) gtkhtml_ok=true ;;</div><div class='del'>-	esac</div><div class='del'>-else</div><div class='del'>-	gtkhtml_ok=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if $gtkhtml_ok; then</div><div class='del'>-	AC_MSG_RESULT($vers found)</div><div class='del'>-else</div><div class='del'>-	AC_MSG_ERROR(GtkHTML 0.2 or later is required to compile Evolution)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`"</div><div class='del'>-GTKHTML_LIBS="`gnome-config --libs gtkhtml`"</div><div class='del'>-</div><div class='del'>-AC_SUBST(GTKHTML_CFLAGS)</div><div class='del'>-AC_SUBST(GTKHTML_LIBS)</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl Gnome-VFS checking</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(for GNOME-VFS)</div><div class='del'>-if gnome-config --libs vfs &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-	vfs_ok=true</div><div class='del'>-else</div><div class='del'>-	vfs_ok=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if $vfs_ok; then</div><div class='del'>-	AC_MSG_RESULT(found)</div><div class='del'>-else</div><div class='del'>-	AC_MSG_ERROR(GNOME-VFS is required to compile Evolution)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"</div><div class='del'>-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"</div><div class='del'>-AC_SUBST(BONOBO_VFS_GNOME_LIBS)</div><div class='del'>-AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)</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'>-dnl GNOME_PILOT_CHECK</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl ******</div><div class='del'>-dnl XML</div><div class='del'>-dnl ******</div><div class='del'>-GNOME_XML_CHECK</div><div class='del'>-xmlversion=`xml-config --version | sed 's/^libxml//'`</div><div class='del'>-xmlmajor=`echo $xmlversion | awk -F. '{print $1;}'`</div><div class='del'>-xmlminor=`echo $xmlversion | awk -F. '{print $2;}'`</div><div class='del'>-xmlpatch=`echo $xmlversion | awk -F. '{print $3;}'`</div><div class='del'>-if test "$xmlmajor" -ne 1 -o "$xmlminor" -ne 8 -o "$xmlpatch" -lt 7; then</div><div class='del'>-	AC_MSG_ERROR(gnome-xml 1.8.7 (or later, but not 2.0) is required to compile Evolution)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(CAPPLET_LIBS)</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl Whether to use OAF</div><div class='del'>-dnl ******************************</div><div class='del'>-</div><div class='del'>-AC_MSG_CHECKING(if Bonobo uses OAF)</div><div class='del'>-if ( gnome-config --libs bonobo | grep oaf ) &gt; /dev/null 2&gt;&amp;1 ; then</div><div class='del'>-	enable_oaf="yes"</div><div class='del'>-else</div><div class='del'>-	enable_oaf="no"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_MSG_RESULT("$enable_oaf")</div><div class='del'>-</div><div class='del'>-if test "x$enable_oaf" = "xyes"; then</div><div class='del'>-        AC_PATH_PROG(OAF_CONFIG,oaf-config,no)</div><div class='del'>-        if test x$OAF_CONFIG = xno; then</div><div class='del'>-                AC_MSG_ERROR("You enabled OAF support but oaf-config was not found")</div><div class='del'>-        else</div><div class='del'>-                OAF_LIBS=`$OAF_CONFIG --libs`</div><div class='del'>-                OAF_CFLAGS=`$OAF_CONFIG --cflags`</div><div class='del'>-                GNORBA_LIBNAME=</div><div class='del'>-        fi</div><div class='del'>-else</div><div class='del'>-        OAF_LIBS=</div><div class='del'>-        OAF_CFLAGS=</div><div class='del'>-        GNORBA_LIBNAME=gnorba</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(OAF_LIBS)</div><div class='del'>-AC_SUBST(OAF_CFLAGS)</div><div class='del'>-</div><div class='del'>-AM_CONDITIONAL(USING_OAF, test "x$enable_oaf" = "xyes")</div><div class='del'>-</div><div class='del'>-if test "x$enable_oaf" = "xyes"; then</div><div class='del'>-	AC_DEFINE(USING_OAF)</div><div class='del'>-	BONOBO_GNOME_LIBS="`oaf-config --libs` $BONOBO_GNOME_LIBS"</div><div class='del'>-	BONOBO_GNOME_CFLAGS="`oaf-config --cflags ` $BONOBO_GNOME_CFLAGS"</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'>-AC_MSG_CHECKING(for Kerberos 5)</div><div class='del'>-AC_MSG_RESULT(${with_krb5:=no})</div><div class='del'>-if test x$with_krb5 != xno; then</div><div class='del'>-	KRB5_CFLAGS="-I$with_krb5/include/krb5"</div><div class='del'>-	KRB5_LDFLAGS="-L$with_krb5/lib -lkrb5 -lk5crypto -lcom_err"</div><div class='del'>-	AC_DEFINE(HAVE_KRB5)</div><div class='del'>-fi</div><div class='del'>-AC_MSG_CHECKING(for Kerberos 4)</div><div class='del'>-AC_MSG_RESULT(${with_krb4:=no})</div><div class='del'>-if test x$with_krb4 != xno; then</div><div class='del'>-	KRB4_CFLAGS="-I$with_krb4/include -I$with_krb4/include/kerberosIV $KRB5_CFLAGS"</div><div class='del'>-	save_LDFLAGS="$LDFLAGS"</div><div class='del'>-	LDFLAGS="$LDFLAGS -L$with_krb4/lib"</div><div class='del'>-	AC_CHECK_LIB(krb, krb_mk_req,</div><div class='del'>-		[KRB4_LDFLAGS="-L$with_krb4/lib -lkrb -ldes"],</div><div class='del'>-		[KRB4_LDFLAGS="-L$with_krb4/lib -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],</div><div class='del'>-		-ldes)</div><div class='del'>-	LDFLAGS="$save_LDFLAGS"</div><div class='del'>-	AC_DEFINE(HAVE_KRB4)</div><div class='del'>-fi</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 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'>-AC_OUTPUT([</div><div class='del'>-Makefile</div><div class='del'>-evolution.spec</div><div class='del'>-macros/Makefile</div><div class='del'>-intl/Makefile</div><div class='del'>-po/Makefile.in</div><div class='del'>-e-util/Makefile</div><div class='del'>-libibex/Makefile</div><div class='del'>-camel/Makefile</div><div class='del'>-camel/providers/Makefile</div><div class='del'>-camel/providers/mbox/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/providers/vee/Makefile</div><div class='del'>-camel/providers/imap/Makefile</div><div class='del'>-composer/Makefile</div><div class='del'>-widgets/Makefile</div><div class='del'>-widgets/e-paned/Makefile</div><div class='del'>-widgets/e-table/Makefile</div><div class='del'>-widgets/e-text/Makefile</div><div class='del'>-widgets/meeting-time-sel/Makefile</div><div class='del'>-widgets/misc/Makefile</div><div class='del'>-widgets/shortcut-bar/Makefile</div><div class='del'>-addressbook/Makefile</div><div class='del'>-addressbook/ename/Makefile</div><div class='del'>-addressbook/contact-editor/Makefile</div><div class='del'>-addressbook/printing/Makefile</div><div class='del'>-addressbook/backend/Makefile</div><div class='del'>-addressbook/backend/idl/Makefile</div><div class='del'>-addressbook/backend/pas/Makefile</div><div class='del'>-addressbook/backend/ebook/Makefile</div><div class='del'>-addressbook/gui/Makefile</div><div class='del'>-addressbook/gui/minicard/Makefile</div><div class='del'>-addressbook/gui/component/Makefile</div><div class='del'>-shell/Makefile</div><div class='del'>-shell/glade/Makefile</div><div class='del'>-mail/Makefile</div><div class='del'>-data/Makefile</div><div class='del'>-libversit/Makefile</div><div class='del'>-libibex/Makefile</div><div class='del'>-calendar/Makefile</div><div class='del'>-calendar/doc/Makefile</div><div class='del'>-calendar/doc/C/Makefile</div><div class='del'>-calendar/idl/Makefile</div><div class='del'>-calendar/cal-util/Makefile</div><div class='del'>-calendar/cal-client/Makefile</div><div class='del'>-calendar/pcs/Makefile</div><div class='del'>-calendar/gui/Makefile</div><div class='del'>-calendar/gui/dialogs/Makefile</div><div class='del'>-notes/Makefile</div><div class='del'>-filter/Makefile</div><div class='del'>-notes/Makefile</div><div class='del'>-wombat/Makefile</div><div class='del'>-art/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/Directories/Makefile</div><div class='del'>-default_user/local/Directories/subfolders/Makefile</div><div class='del'>-default_user/local/Directories/subfolders/Bigfoot/Makefile</div><div class='del'>-default_user/local/Directories/subfolders/Netcenter/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/Trash/Makefile</div><div class='del'>-tools/Makefile</div><div class='del'>-doc/Makefile</div><div class='del'>-doc/C/Makefile</div><div class='del'>-])</div><div class='head'>diff --git a/data/.cvsignore b/data/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>data/.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/data/Makefile.am b/data/Makefile.am<br/>deleted file mode 100644<br/>index 1ae1b2443e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>data/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	evolution.desktop
\ No newline at end of file</div><div class='head'>diff --git a/data/evolution.desktop b/data/evolution.desktop<br/>deleted file mode 100644<br/>index da37bb15fb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.desktop?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>data/evolution.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Evolution</div><div class='del'>-Name[da]=Evolution</div><div class='del'>-Name[lt]=Evolution</div><div class='del'>-Name[no]=Evolution</div><div class='del'>-Name[ru]=ü×ÏÌÀÃÉÑ</div><div class='del'>-Comment=Mail, Contacts and Task.</div><div class='del'>-Comment[da]=E-post, kontakter og opgaver.</div><div class='del'>-Comment[lt]=El. paðtas, adresai ir uþduotys</div><div class='del'>-Comment[no]=E-post, kontakter og oppgaver.</div><div class='del'>-Comment[ru]=üÌ.ÐÏÞÔÁ, ËÏÎÔÁËÔÙ É ÚÁÄÁÎÉÑ.</div><div class='del'>-Exec=evolution</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 6bc356fa18..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/ChangeLog?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</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='head'>diff --git a/default_user/Makefile.am b/default_user/Makefile.am<br/>deleted file mode 100644<br/>index 2669874e5f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-SUBDIRS = local</div><div class='del'>-</div><div class='del'>-defaultdir = $(prefix)/share/evolution/default_user</div><div class='del'>-default_DATA = shortcuts.xml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(default_DATA)</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 6c0407f9e4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Contacts/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Contacts/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +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'>-EXTRA_DIST = $(defaultcalendar_DATA)</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/Directories/.cvsignore b/default_user/local/Directories/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/.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/Directories/Makefile.am b/default_user/local/Directories/Makefile.am<br/>deleted file mode 100644<br/>index 64eb44d5b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories</div><div class='del'>-</div><div class='del'>-defaultdirectory_DATA = 		\</div><div class='del'>-	folder-metadata.xml</div><div class='del'>-</div><div class='del'>-SUBDIRS= subfolders</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultdirectory_DATA)</div><div class='del'>-</div><div class='head'>diff --git a/default_user/local/Directories/folder-metadata.xml b/default_user/local/Directories/folder-metadata.xml<br/>deleted file mode 100644<br/>index 23b773838a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/folder-metadata.xml?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/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;Internet Directory Servers&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/.cvsignore b/default_user/local/Directories/subfolders/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/.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/Directories/subfolders/Bigfoot/.cvsignore b/default_user/local/Directories/subfolders/Bigfoot/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Bigfoot/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Bigfoot/.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/Directories/subfolders/Bigfoot/Makefile.am b/default_user/local/Directories/subfolders/Bigfoot/Makefile.am<br/>deleted file mode 100644<br/>index 67f2f55a2a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Bigfoot/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Bigfoot/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfolders/Bigfoot</div><div class='del'>-</div><div class='del'>-defaultdirectory_DATA = 		\</div><div class='del'>-	folder-metadata.xml		\</div><div class='del'>-	uri</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultdirectory_DATA)</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml b/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml<br/>deleted file mode 100644<br/>index 905fcbe84a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Bigfoot/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;Bigfoot&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/Bigfoot/uri b/default_user/local/Directories/subfolders/Bigfoot/uri<br/>deleted file mode 100644<br/>index fd658ed9b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Bigfoot/uri?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Bigfoot/uri</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-ldap://ldap.bigfoot.com/
\ No newline at end of file</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/Makefile.am b/default_user/local/Directories/subfolders/Makefile.am<br/>deleted file mode 100644<br/>index 1dc5d5ce8e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfolders</div><div class='del'>-</div><div class='del'>-SUBDIRS= Bigfoot \</div><div class='del'>-	 Netcenter</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/Netcenter/.cvsignore b/default_user/local/Directories/subfolders/Netcenter/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Netcenter/.cvsignore?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Netcenter/.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/Directories/subfolders/Netcenter/Makefile.am b/default_user/local/Directories/subfolders/Netcenter/Makefile.am<br/>deleted file mode 100644<br/>index aca286c422..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Netcenter/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Netcenter/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfolders/Netcenter</div><div class='del'>-</div><div class='del'>-defaultdirectory_DATA = 		\</div><div class='del'>-	folder-metadata.xml		\</div><div class='del'>-	uri</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultdirectory_DATA)</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml b/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml<br/>deleted file mode 100644<br/>index c3292f4130..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Netcenter/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;Netcenter&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Directories/subfolders/Netcenter/uri b/default_user/local/Directories/subfolders/Netcenter/uri<br/>deleted file mode 100644<br/>index 6be98a814d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Directories/subfolders/Netcenter/uri?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Directories/subfolders/Netcenter/uri</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-ldap://memberdir.netscape.com/ou=member_directory,o=netcenter.com
\ No newline at end of file</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 144b8bb834..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Drafts/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Drafts/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Drafts</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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 9b3910df46..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Inbox/mbox?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Inbox/mbox</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2225 +0,0 @@</div><div class='del'>-From -</div><div class='del'>-Return-Path: danw@helixcode.com</div><div class='del'>-Delivery-Date: Tue May  9 11:16:21 2000</div><div class='del'>-Received: from trna.helixcode.com (IDENT:root@trna.helixcode.com [140.239.238.2])</div><div class='del'>-	by twelve-monkeys.helixcode.com (8.9.3/8.9.3) with ESMTP id LAA26395</div><div class='del'>-	for &lt;danw@twelve-monkeys.helixcode.com&gt;; Tue, 9 May 2000 11:16:21 -0400 (EDT)</div><div class='del'>-Received: from twelve-monkeys.helixcode.com (twelve-monkeys.helixcode.com [140.239.238.12])</div><div class='del'>-	by trna.helixcode.com (8.9.3/8.9.3) with ESMTP id LAA02867</div><div class='del'>-	for &lt;danw@helixcode.com&gt;; Tue, 9 May 2000 11:14:49 -0400</div><div class='del'>-Received: (from danw@localhost)</div><div class='del'>-	by twelve-monkeys.helixcode.com (8.9.3/8.9.3) id LAA26391;</div><div class='del'>-	Tue, 9 May 2000 11:16:21 -0400 (EDT)</div><div class='del'>-Message-Id: &lt;200005091516.LAA26391@twelve-monkeys.helixcode.com&gt;</div><div class='del'>-To: Eva Lucy Ann Tester &lt;eltester@helixcode.com&gt;</div><div class='del'>-MIME-Version: 1.0</div><div class='del'>-Content-Type: multipart/related; boundary="----- =_aaaaaaaaaa0"</div><div class='del'>-Content-ID: &lt;26389.957885364.0@twelve-monkeys.helixcode.com&gt;</div><div class='del'>-Date: Tue, 09 May 2000 11:16:21 -0400</div><div class='del'>-From: "Helix Code, Inc." &lt;hello@helixcode.com&gt;</div><div class='del'>-Subject: Welcome to Evolution!</div><div class='del'>-</div><div class='del'>-------- =_aaaaaaaaaa0</div><div class='del'>-Content-Type: text/html; charset="us-ascii"</div><div class='del'>-Content-ID: &lt;26389.957885364.1@twelve-monkeys.helixcode.com&gt;</div><div class='del'>-Content-Transfer-Encoding: quoted-printable</div><div class='del'>-</div><div class='del'>-&lt;!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"&gt;</div><div class='del'>-&lt;html&gt;</div><div class='del'>-  &lt;head&gt;</div><div class='del'>-    &lt;title&gt;Welcome to Evolution Pre-Release!&lt;/title&gt;</div><div class='del'>-  &lt;/head&gt;</div><div class='del'>-</div><div class='del'>-  &lt;body background=3D"cid:26389.957885364.2@twelve-monkeys.helixcode.com"&gt;</div><div class='del'>-		&lt;img src=3D"cid:26389.957885364.3@twelve-monkeys.helixcode.com" align=3Dcenter&gt;&lt;br&gt;</div><div class='del'>-		=</div><div class='del'>-</div><div class='del'>-		&lt;blockquote&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-		&lt;p&gt;A warm welcome from the whole Evolution development</div><div class='del'>-		team. Thank you for helping us test Evolution; with</div><div class='del'>-		your feedback we can make it the best groupware suite</div><div class='del'>-		available today.&lt;/p&gt;</div><div class='del'>-		=</div><div class='del'>-</div><div class='del'>-		&lt;/blockquote&gt;	=</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		&lt;h4&gt;Getting Started&lt;/h4&gt;</div><div class='del'>-</div><div class='del'>-		&lt;blockquote&gt;</div><div class='del'>-</div><div class='del'>-   &lt;p&gt;On the left of the Evolution window is the Shortcut Bar, with</div><div class='del'>-	 icons labelled Inbox, Calendar, and Contacts.  You can click on those icons to jump from one tool to</div><div class='del'>-	 another.&lt;/p&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-		  &lt;dl&gt; &lt;!-- &lt;dt&gt;&lt;b&gt;&lt;font color=3D"#993366"&gt;Today&lt;/font&gt;&lt;/b&gt;&lt;/dt&gt; =</div><div class='del'>-</div><div class='del'>-		  &lt;dd&gt;This tool offers a summary of new messages and the tasks</div><div class='del'>-			 and appointments you have lined up for today.&lt;/dd&gt;--&gt;</div><div class='del'>-			 =</div><div class='del'>-</div><div class='del'>-		  &lt;img src=3D"cid:26389.957885364.4@twelve-monkeys.helixcode.com" align=3Dright&gt;</div><div class='del'>-</div><div class='del'>-        &lt;dt&gt;&lt;b&gt;&lt;font color=3D"#993366"&gt;Inbox&lt;/font&gt;&lt;/b&gt;&lt;/dt&gt; =</div><div class='del'>-</div><div class='del'>-		  &lt;dd&gt;Click on this icon to see your email - all of it.  Your</div><div class='del'>-		  Inbox is also where you can access Evolution's powerful tools</div><div class='del'>-		  to sort, filter, organize, and search your mail.</div><div class='del'>-		     &lt;/dd&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-		  &lt;dt&gt;&lt;b&gt;&lt;font</div><div class='del'>-		  color=3D"#993366"&gt;Calendar&lt;/font&gt;&lt;/b&gt;&lt;/dt&gt; &lt;dd&gt;Network</div><div class='del'>-		  and share your calendar to keep your whole</div><div class='del'>-		  organization on schedule and up to date.  &lt;/dd&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-        &lt;dt&gt;&lt;b&gt;&lt;font color=3D"#993366"&gt;Contacts&lt;/font&gt;&lt;/b&gt;&lt;/dt&gt; =</div><div class='del'>-</div><div class='del'>-		  &lt;dd&gt;The Contact manager holds your addresses, phone numbers, and</div><div class='del'>-        contact information.  Like calendar information, contact data</div><div class='del'>-        can be synchronized with hand-held devices and shared over a</div><div class='del'>-        network.&lt;/dd&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-		  &lt;!-- &lt;dt&gt;&lt;b&gt;&lt;font color=3D"#993366"&gt;Tasks&lt;/font&gt;&lt;/b&gt;&lt;/dt&gt;</div><div class='del'>-		  &lt;dd&gt;The Tasks tool combines a "to do" list with</div><div class='del'>-		  alarms and reminders to help you keep track of</div><div class='del'>-		  daily events.</div><div class='del'>-		  &lt;/dd&gt; --&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-        &lt;!--&lt;dt&gt;&lt;b&gt;&lt;font color=3D"#993366"&gt;Notes&lt;/font&gt;&lt;/b&gt;&lt;/dt&gt; =</div><div class='del'>-</div><div class='del'>-		  &lt;dd&gt; Write poems, take down messages from phone conversations,</div><div class='del'>-		  or keep small things organized: Notes is your catch-all</div><div class='del'>-		  notepad.&lt;/dd&gt; --&gt;</div><div class='del'>-</div><div class='del'>-		&lt;/dl&gt;</div><div class='del'>-		  =</div><div class='del'>-</div><div class='del'>-		&lt;/blockquote&gt;</div><div class='del'>-		=</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'>-</div><div class='del'>-------- =_aaaaaaaaaa0</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;26389.957885364.2@twelve-monkeys.helixcode.com&gt;</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhEcJQyUsSkAACAASURB</div><div class='del'>-VHjabL3ZcuRIkiyqAByOLSJIZlZN95z//6Hzch5G5J5lZrqWriQZG/btPpiruYHZKVLSXZVkBBZ3</div><div class='del'>-czM1VbXkr7/+c++6Fnmew/sCSZJg2zY45zDPM/7885/4+9//hiRJsCwLsixDkiRwLsM0zUiSBGma</div><div class='del'>-Yl1XpGmKtn2iqmqkaYp933G73dE0NZxzWNcV27Yizz32fce2bfq7+75hXTcURQHvc+w7kKUJrrc7</div><div class='del'>-8jxHlmXI8xzrumJZFgDAy+WMfQfGaULfd3AuR5qm2LYNAJCmKbquQ13XAIBt28K1O2zbpj93u93Q</div><div class='del'>-NA2SJNHfA4Asy9C2LZqmwb7vh89YlgVJkiDPc4zjgCRJkWUZvM9xvd7gfY6iKPHx8YG3tzds24b7</div><div class='del'>-/Y6Xlxf9rHVd9fklSYJ931FVJR6PB+Z5Rl03uN1uOJ1OODUNxmnCMAzw3qPwOQBgmhc4l2GeF0zT</div><div class='del'>-hDRN4ZzD4/GAcw7TNOF0OgEA5nnGvu8oy1LvbxgGZFmGrutQVRWausK8rGjbFmVZYhgGNE2D3GWY</div><div class='del'>-lxXbtmGeJyRJqp+fZRmcc3AuQ+E9lnXFMIxYlgWPxwOnUwPncuR5jnmesW0b8jzXZ5BlGbIsxTTN</div><div class='del'>-KAsPX1Ro2ye2bcPtdsMvv3zHum7h9xy6rkOSpMjzXJ/bvu/o+x7OZfC+0Pt9PB749ddfkSTAum6Y</div><div class='del'>-5zk8dyDPPfLcYV1lHS7LgjRNkWUp+l6ey+12w+vrK/Z9R5IkuN2u8L5AXdfIsiysaVkT67qCf5xz</div><div class='del'>-KIsCv//xB15fX8NzTnE+n+F9gc/PT2RZhsLncC7Hf/7nf6E5NZjnGWVZoChK7PuO6/WKt7c3fXdN</div><div class='del'>-XSFNM3R9jyRJMAyDfFdZoqpqDEOHdd10bX1+fuJ8PqOpK+R5jmGcdP8kSQI3zxPSNEOeeziXYVlW</div><div class='del'>-fXh84Fxs27bp/+dGybJMN5M3P1dVJaZp1oeR5w5pmmKe5d+fzyecc7oQk8Rhmlp0XYd5zrFtG+q6</div><div class='del'>-hssyDTphfyJNU6RpinGadBHxpUtg2jQATdOMpkl0ocpmk2vs+14XYha+x75E+f1JAwg3Lu+Jf/Lc</div><div class='del'>-h8Uni0muN0XuMgDAOI5I0xRVVcmzcA7DOKLrOhRFoQFgHAc8nyucy5EkKcqywLLUsnGWBfM8I89z</div><div class='del'>-5LnDs23hfQGfO92wSQINvlVVwXtZ4HVVYl5Wvb91XQ/P3jmHl5cXDVrz46FBQn4mRZKm2Pcl3Hse</div><div class='del'>-3uWMJJFnwWc9z4v+ngS3DFVVY1kW3fhZKv9921Z9H/zzeLYY3z/0+vnMs0w2pssc8tzr5x/fiaxj</div><div class='del'>-e4gBcpBs+66HFJ+DHD6brneuJR5IaZojy5weVgBQFCXKssQpbFZ+zrIs2Pdd11HuMizrgvv9JuvY</div><div class='del'>-OQlYSND3na7pddsxdh3KqkSe56iqSp6TyzCFZynXI4HbFwX6fsC6ruH5J7qGPz8/UJYlpmk6HCzO</div><div class='del'>-yRqRZybPbZ5neffruoUIUmCaZkzTiDz3WJYZSZJKVpCm+Py8Is9zbOFFcyMuy3J4mN4XaJoaRVGi</div><div class='del'>-74fwIFPsu2y6fd+RpQmqqkKSJOi6Ds45VFWJNE1DJJPgkaYpun5AnQB8z2ma4vl8Is9zvFzO2MJf</div><div class='del'>-JGYV8cYl0u260HmyM8jJZsrx8vIiGyWcuM45XbDjOGGaRl30/HwGkKqqkKYpvPdo6jqckDOKosAw</div><div class='del'>-ThiGEUmSoK4rZFmGZVlQFrJIJdvx8D5H23YhCDsU3uPZtti3DdM4hcxMNhoXmHMSJJM0xTRJICuK</div><div class='del'>-Iiws6CIch10XUpqmaOoaaZZiWzcNoAzi0zTrBuA9TtOMYRj13m1Ak8zMI8vSsIkWzQ64OadJMgFm</div><div class='del'>-CO/vH6jrWt8XN2vMroCyLPSkkw2wIctkffX9U7PBLE303mQjePOOFw0Az7ZFkqQagJjJSrayYFlW</div><div class='del'>-zUTWdQ17QLILCVapHijOORSFx75t+m6TJNHf5Trb9h3zvMB7CRi5y7Bushb5nJkV8x3UVYmyOmEc</div><div class='del'>-O+R5gXG6Azh+/vPZ6gHrvdxvlib6/Ppe1hGzWhvE123XYMLrdNyIcmFTSNWc3gwXAX9OFuCmF87/</div><div class='del'>-pidFkqBtO11EXAgMFAAwLyucy7CuG8qyRJIk8CED4SmUpRmmeQoLzZuMQ05Gpr88mXkPf/z+J5pT</div><div class='del'>-oxuTfyQFv8E52Sh5nuvJJRt+xTTKC73fb2FDlchzp6eKDTRMsfZ9R+7kOd3ud5RleThpm6bBt2+v</div><div class='del'>-ckJlDl3fY5wmOc2cQ+4yZGGh8zrXTZ79vKzYwulzu900YMzzrCcwF1Lf9/C5g3M5+pDWT/OC2/2B</div><div class='del'>-t7dM31E/DPqu5B1IOfR4PPS5LMt8CHh1VWKaFz0lsyxFmsbP5OaX8iPH8/nUbIf/bNuGYVg0SOUu</div><div class='del'>-w2hKyHme9ZTMXQxwfL/Lsup75rNfwvsYx1GvhYGbz0WCc6Hvimuav8PgxQ3BNVuWBfYdmOYZdSgx</div><div class='del'>-sizTTKdfh8P65jriRmd5XFUl6qpEmjl8fn7qu2Pg4J+iKNB2fcjUUixLxzz0EGT6vsM8zxiGFE3T</div><div class='del'>-IEsTJGmK57PVbLSpa+z7Du9zTOOoQZSlii3nHdPKBEnYFBIZh2HUl/31j6YPYRNz4S4hzdz3HZJZ</div><div class='del'>-ZADkAbVtGzd3+EwGiaLwmgauqyxGbiBZjE7xgmGQ07gsPOZlxTgO8TRMElS1RNyyKND1fXhxKbZN</div><div class='del'>-rsX7HE1daTSU615wu91Q1xWcE/whz+VklvLIwWUO4zTpy2bq7HNn0tENXddpRsDNmmUZHo8H0jTU</div><div class='del'>-ypnDskrK2HY9siyWJ/u+YxhGXcBMLcuy0JrVPud5XkKpsGDddmyznOqs2SV1zvS04QKUZ9shTTPF</div><div class='del'>-XQDA5043HlPFYZx0bazrphux8B7DOGKaZnif4/F4AgBOpxOqqtRyIUnketouXpsvKozhJDyWDKmU</div><div class='del'>-NF2v2RQPjySB3jt/j5vWOafZhJSEHmVZoO+9btKi8JrN2FOZ98M1lGUZfO4PWBKzV/4s/2Hw4j76</div><div class='del'>-vF5DEJVrABLZ2CF48vM/Pz+1zLEBK2Yly6H0mKYxZFYpiqLU4DZOsx6wDLbLItciWXSm1/n1z/P5</div><div class='del'>-gPvx4x0vLxeM4xguHJjnTqOUTauZDXChzvNyqMM0mCSJPtxtk438uN/x7ft3FN5jnCaN4ltIpfZ9</div><div class='del'>-1xSO0UletDyAYRg0SEhNLJu/KCTCDuMUUqMahc/hiwqDiX5JkuByueByOSPLCoxDq9fgnMPpdJJT</div><div class='del'>-30u2UZUlXO4xjiP6fkCe59j3XR8kXwyBMZuplGWBfdswTnPAOuRE46kzLwu6rgsvPQOQ/UtQ0G4K</div><div class='del'>-1vvO5Zim9lDSAID3XmvreR4wTjHaO+eQpQmWZT+8TwZOYijysznybdc6VDZ9zOb4Xpdl0Wzifr+j</div><div class='del'>-rmMpxAzNZRnWkGJv26Z177ysGKf7IXMj0Et8hnWt9zFbk39HWCvukEr73CFNMwxhHe/7DpdlGEcp</div><div class='del'>-QYqiwLZtmp00daW4wRjWyTgOWFfBnt4/PjSoSMaTKvBrMaLn84ksk3JIsJc6lHepPsOIc8VUndlW</div><div class='del'>-4b1mbBL8FozjqBkF9x1BZv5cWXgkIfiMYwR/y8JrZriuK4ZxwOl8OoCVfd9j3zc4l8Odzyf88v27</div><div class='del'>-qZUSfTFyyuCQikmaNcP7QlFkbgBe4LIsGMYppGdyar6+veHlcoEvCjzbVoG0ZVm0ls7zXGuYeONA</div><div class='del'>-13Wa3shLiXVr7jIkAUhq21ZPjbaTurjrOpxOJ3jvw80PSJIBfT/ooiL6630OXxQYpwnbtioSzbQy</div><div class='del'>-or6rvhAJYIOcKAFR3sMC3sJL5LOqqhIuy9D1QwDsKgFHkwRdP+jG5POX551odH88W33RfB/7vuP3</div><div class='del'>-3/9A0zRYQ/DlZzCAyDUnh4XIf6T7w+7KimmeQrDYMC/xxCJAzLRdAr6UjHVdCfZTV5LKh3sc90mz</div><div class='del'>-CHZTyrJUFJplpr0XBlnnMs1CuYmmeYkZV5oiyyLwPM0LlmXQ7GxZZs1KmZFIyVlI/VxUeDzuWnbI</div><div class='del'>-ppSs5dQ0GMYxnNqJBhqu2b7vw6b3GkirqsRvv/2uHZfL5YxlWUNGuR9K2GVZUdc1cucE1BuGQ2a2</div><div class='del'>-batmPty07KBwDX58XjUYMOPJc4d9h64lCaqyx5Zl0cOZ2EHfd3Cvry/IfQEgh58nuMzpySmnw89R</div><div class='del'>-j6eZbSexRcfOAVO1ovABIKuwY8e27boIuYHKsghYADDPqYIvy7LpTRIUWtYlpKGyOFnnykbzWk91</div><div class='del'>-XafdiWVZNCUlyPP5eUOSJHh9vSBJUkzTqBnOtm0YJ6K+PrysTE/8adr1dCCYJxtWntk///oMi+Ci</div><div class='del'>-z0zR5dwhyySNK8KLWLfVBNCITMvvxv/PwMtsSzbXhDQAVWXhD6DY7XY7gJjDMGCaRtR1rZ/De5aU</div><div class='del'>-8BmyqErxkRiMwvOeRq3/pTySANL3A5L0jHWbMHX9YVNL8KsEH0kTDGEx8n3Zzc8/LDW2bcUwTnoq</div><div class='del'>-Lt5r+cNgl4fui63lidsQUPRFhWWWwyhNEiyhVGIwimUE4HKPItTeW+jqxJ/JEBIf5CEYFT5Hnhea</div><div class='del'>-CXifYxylrOv6DkVZYN93PcjKshTAbhjweD4PKTrBTJsNz/OE57ONXaTcYVkyDVzTNGLfQ4u07zVj</div><div class='del'>-A+RQBHZpP4aOEbOVLDsj+d//+3/tdV3h+WyxLHOoqTIAe2gnpOELF6235FQSpHvfgWHo0dQ15kXa</div><div class='del'>-J0mShv8l8CIpaB96lkz7y7LQk7UJrbau75E7SXXvj4cGlKqskPscHyE1S9MMfd/rjTLQrOsKn3s8</div><div class='del'>-no+QLo9wzuF8PqFteyzLjLaVWvV8vuB8PmEYRuUrJEkaIq3cqwCj8v3crI/HU/vWPvRxiWssoV03</div><div class='del'>-jiPO57MAb/2AovAovA/YwxI2GMKGYneB4NikCDjATZhi2+REKbzH/fFAbur1pm7gco/H4w5gD4j8</div><div class='del'>-LFlHyLTWdcU4jmiaE/Z9U6zma7Cpqgr7LgHHlgwA0HU9yrIIte8SShjJ0oQvIFiJPTTk/yfa7dh3</div><div class='del'>-CTLrKmBcURT6/ZIBBMAynLTe+5AF5aGrk2gLERAQkF/nQ4CQz0PoFMza/ZFywOsaZwAiCMnP5Pr9</div><div class='del'>-+PiQ9dk0ep3DINdcVQU+P69aoo3jiLoqUdVnDEOLMWQRzNj4TLLMBUxhC1mCZDvbtuJ8voR3Ks+B</div><div class='del'>-e7Pve5xOTdjcUlrxsxjgvc9xu93R9x2a5oSiiDgG12/btQdgPvnx4792/gderHMOwyAtvOezxa+/</div><div class='del'>-/orH46Fts0iYyFCVJT6v14B+p/rQCU6QyGD751yIZSmtP+IPrMN4wuz7jo+PD/z66696MhJMKYpC</div><div class='del'>-ywWmPkmCkOJLRK2rCu/v77i8vKCqavR9h2URwkxZljifX5AkGdZ1wPV60xbP89lqjfTx8YHv37/r</div><div class='del'>-M4mdkUlblvu2KQZhEd7L5YL39w8NJnKCRsBPUjz2/ZMDQMPP+Pz8xMvLiy7UsvBS2vSDPhP20omU</div><div class='del'>-82fZqvzbv/0bukCSWZYV5/MZfd8pnhPRfTlV6rrGPE3o+h73+/1AhGEaSsIS+/nO5TifGiRpisfj</div><div class='del'>-qTjO7XbT989Fx9//+PgIQarWGp3P5vF46Lv69ddf9fRNwuZvu16zL7YlWVJwjZKItK0bmpNs4HVd</div><div class='del'>-NRW2YCezRa47tpp/+8fv+Pf/8Xf88v27Es6kPe51vTKl5+exXBBQeMAvv3zTLIt7Zllm3SMsd7uu</div><div class='del'>-w/l81g5Jmqa43e44n09I0xSn0wnrsqALHZ9hnDDPsxLDhnHS766qEmmS4P3jE29vrwo8E7dj9uey</div><div class='del'>-LNN+KlNKvqiiKFB4j3/+85/Ytx3fvn+THqipUduAegvjrJFI9i9ALNvrJamhCiUEA4psoECkyF04</div><div class='del'>-YaS1QiLHNE3aA04S2URVWSpCz0CSJInUccty6JNy0VRliW2b8f7+Z+ixh99DoimaBKPUoPEbkkR6</div><div class='del'>-8WVZhgXvsK0LxlCGcONKytdiW1fkudNsRTYqF56kqoXPw/1tyrRzTtpx87wc0t15WTGHvjUDDhev</div><div class='del'>-dBAGTa8jHtJhnidsm3zm4xE3ex5qWoJSbAnak5vvzmIPxGQkBZdDwAYulnnPkOI2TaP1ts8dXJYp</div><div class='del'>-wHdqhCn44/1d61OSYoZ+QOE95mUJPJVJDyKCeNuWK4bD7hNLvW3bcL6c4b3HqanR9YMwTbcN03wE</div><div class='del'>-RW3qXJYFvC/w/ZfveHt7Re5rTIHjwEyFwHVRRH7INI0YBimzqqrGOE7wucc0zXp49AE3syVPkiQ4</div><div class='del'>-n884nSQ7e7YtnMv1pF/XFY/Hw3QfsuO1h64Wn5/PPdIsRZokmOcFfT8oDmBxIMeTna2ibZPTqq5r</div><div class='del'>-TNOEddsDcFLjcjnracFFSYCKNS4/r6oq9H2P5/OJl5cXZf7xu9Z11TYdb1BeZiAoZE5TNgJPSZLg</div><div class='del'>-/f0D57OASfxettQ+Pj5wPp+VSEQgqOsH/QyeQG3XGcDJacCZA/AipYcH0OK///sf8D7H29ubAn3T</div><div class='del'>-NIVuxnBgmFmG4Lpu6IceRVlocKirUjc7f29eVmGOhWfKHjxbaFw4Nl3lhrSdAAZAkotut5vWuNys</div><div class='del'>-XKQEJplKp2kqLahlDjjHFFLpCCbyVJW2VCTHrJt8b1l45SEQnS/LCk3TaPpKIJHlonMCvO4Be7D3</div><div class='del'>-VVcV5vCc9y+EL6Lzuwl+PGF3fX855nmVNmfukLkc29YpuDgMg8kkc91UQkWXtmHTVFiWFX13MyxP</div><div class='del'>-6Tps+64Z7+3+EKwol/KiaQRn+fHjHffHQ1vB5L1YYJB09Dp0JoSjkRvsZ1EMiP898jkyDYQ8LJM0</div><div class='del'>-xe1+l0MgrKlpGjHPcqjbbNYRuWfqI+kR9N/7fsDLy0tI8Uu0bYdhGDRKc2FL6yUCX2VRoG2fUv8H</div><div class='del'>-cMs5Sf3IxGPqbxl62hoMpBzb7tq2DW9vr3h9fUFdN7her6EF5LGuUmeTLdf3Nz0p2BbiRuILIK8+</div><div class='del'>-z11AjldlSvHnkyTBr7/+gqIo0DSNdhpI+2XrzmokyNbi9zJtZpdhWzfcB8kYqCN4PEYFE4m6p4nT</div><div class='del'>-mn+cJkzTFAJYeih92DPm7+Yu03dDlucwjApkEjiKYF7M2NjWfDweaJpG+8jHGjYzVOBEg2WSpsjC</div><div class='del'>-Pe27dAmyLMXp1EiNPPS68Xi93qeGny/Pz4UaeZwm3O4PfA8AM4HJ2H9fvnRMoGAhsYXcZfC5Q9v1</div><div class='del'>-uN7uShcmPySu41wziGEYQ8a04Xq94+0tVSajtsS1I7ZgMUGL7eoECdZlASDvRJ5FYDBmKeZ5N5ia</div><div class='del'>-4C5VVSs+Ro2JpRezfOEfliNt22JdSyV/2T9sgRdFibqOnJYlXK9j7V54j7br8ecff8IXHlVVaY06</div><div class='del'>-zwv+/PM/Q4TLlXxDUIQvhH3SsijgCxE0nE47TqeTElKKokTXtVq72jYQe8pFUQSAcdceMmub0+mE</div><div class='del'>-wnuJwuGF9cMQePUlTk2NJBWQ0PsC+xbTO5bZTJ1tWvvx8QHvC21TsWVjazqi76xHheyR670wiEnw</div><div class='del'>-3A7tNv7d4/HUFy+YSxQ68Tn2fWcWdqTsWk6AZb7xDwUnz2WGn5dwLysys4lZ6qWpUE/ZzmNWwe8p</div><div class='del'>-AtawrdsBVyAhiO1etummeVfaMIFj5xy6bsAYKNG2FZYkkYGXpbHlx3SVB5AtKyzvnRnl17KL77oo</div><div class='del'>-5F2yJczsk6Sqvh8CMSuDz4Uy64sK7+8/VHB2OuVBaDWHzGkzQTDVg4zXxeyS19h2nWZQ6yoZTtPU</div><div class='del'>-AFKs61OvlZhW7qRDdAvfF2nQobMROBjEuvZdshV+X1WW6Ppen+u6SmZpWYzM+ngfjkgwF1nd1HAu</div><div class='del'>-w+nUoO8H7eOfTiejqltRVTXqWoA1exLu+45xmvBsW72J5/Op7ZdpHPXBuXDDBPd4WtmUlui1jYTP</div><div class='del'>-tgPQaUfBplPLumJoO6XkkvwhAKU3GgGz2L03hJNMyxirDnw+BdiiUjGyH/GTipBlDhFsZiUA8P7+</div><div class='del'>-Hlti4fqE3lxiGgXN/fz8RF3HrIxZBBcauegsaxggmRnY5yGAmQQUKwhyzmGaF5RFEeraCEaNo5QI</div><div class='del'>-VVX+lDFxE/FkoaCF74tkoNxJm1DqUXfQI5DPkTuHHXvAJR4a+C0piKkt01YudoJ/3nvt1BA74SZ0</div><div class='del'>-gWbNYOW9V/xBxTjrhonah73T35W2aoHb7aZZgsVaJsOH+CoqExJZjmfbout6NE2jJLlt3fD+8UMz</div><div class='del'>-NB42SZKowk/S9CxQ0Qfd2PO86SHAcrMoPBIk2LEjzVLtiKgyNrQf+Tz7XoIGW4LOLjCypC7nC4qy</div><div class='del'>-CqdZxASaptH0TjYlDmQhLrwpBBMGi2mSE+Ya2hWsQ6xIiIANU/ay8Pi8XnXzE3VlXz/PhXPO9ImY</div><div class='del'>-gDMABwAs64I0TUz/NJJPCJQJ9Tc36r5c+7n237lgSPf9ypYk1TbiHJtmMNwcTdMcGGBrAAmlRz8j</div><div class='del'>-CboLLgLbossy+VwBlNKfWm15LpRg8tgFcFwUp7GnFkFKboxpmhRniF0KwXReX18VYRe6ao4xoNrc</div><div class='del'>-FJYtSLCWp81kGKPK46c6MFCWlUUYiDH8OX4HM0gLKgufIdeUX07qTDcWAFxvN3z//i1QaVleThG/</div><div class='del'>-CCfw9fqJqqo1YOfOhe6GU9BZuBSjZsZ57nVtc42s64p+GLD3MevgZxIE5ua3JWkkvsk1tu2odT9B</div><div class='del'>-Q3vIxKx71extGEYjFoskO5EgR6FUmsQunYtgD4LwRaSnw+2K6/WKruuNcq/VL5GA8TjwstmO4Yti</div><div class='del'>-QODNVlWlCDNPWda99CMg33wYJxRFiaapUVXloUZnPcbAwBNx3XaVMUcCjjC8hKJaKl+dbcjC5wc9</div><div class='del'>-t6X9WoGOBRBPp5O2bSzPnp97bC1FZFnr3twhDzx6BlDZ7HPcrGlyUIpRT28ZcrZ9ZaXZfT9ocCPI</div><div class='del'>-6ZwwDu1GZNCzKkc+V5Kx+LMx3ZbT5Wutyc1vWYgSrISIdL890Jwa1EGown9Enz7rKc3ft5tz33fc</div><div class='del'>-7w8jtXWqg5d03wfQrjhQghk4ZPMJRbcqS8WXuOmkz3/Ssu09dCOsepOfGQVxWShxxEujaWokSJRN</div><div class='del'>-S6qyc5IRJAk0y1aKcZpg/cLaJEef3hjEPfi+vBeOP/8b1bQ2A/ntt98AAG9vbyoNJ/W564ewTybh</div><div class='del'>-IEhNAqgsuCjgco/n8xEkslK3jON0ZFoFfjvJOxaRPPLUowFH7jLk395QljVOpxHjOKlAwzlJS3xR</div><div class='del'>-4Y8/fkfX9Xh5uRiBxBo2BZREI+24ImQDbaghY50mJcSMNG1EELRuh5qN1ziG048LPUkSXK+fmKZa</div><div class='del'>-a1XNBFymqDXBwCxN9Hu5OEiRXgK3m1TOJAHartcTlKkvF5yeotse0rnk0AkYhlgSMWjZzc97Jxst</div><div class='del'>-4h+iBbC1Mr8vS5PIyjNGKXJ/sUPEhON6u2pXwX5eZF7OyHOvmw8ALi9nZT92oSUahTUpytIHZucE</div><div class='del'>-73MlMvHaRdwyYtskcyL7jTJ0fg/bpwfNe9Bb7DvgcockaFH4rtSnIMs0QHGd9GFtD+OoWg4CeTE7</div><div class='del'>-9MjzAsMQO0up4RlwfU3ThI+PTxV2jdOmhwp/lp9ZVTnqqgL0cIgdDitIIpfG+1zlySQtff/2DX+G</div><div class='del'>-5zdOk3IAZB2mqCoPlyYiJ0xVpDFhWYXhVdcNHo8n8lxAk64btaX0z78+0TSNRhZeoFBTi6j9z1Ij</div><div class='del'>-TpAbTZMEZVUjSzO4oFqa51nbQ1mW4eVFhDt//fWOv368B7Q+V+CLG2dZVgzDgPv9Hii/lVKUmbKn</div><div class='del'>-aYr7/diCIVouRJb5IL4AgKY5aXbDjcZSyaaQEtj84YUwIq/rGngAudaR9pTs+14XHx2Y+DnMHsho</div><div class='del'>-4wJi6cJ692sb0LZVy6LQAIwv0lkLvq7brqn4uu6HFHNdoypN3uVyUCVaujAXM4VFs9KSpRPAVls/</div><div class='del'>-DIcM0foF+NwHSngsTYpgDOKcQ1PX6AMWQAbmPC8q5OmzKP+NJUnEqO73x0/CK1u+jIHVum1bbAkb</div><div class='del'>-jQIPiVml6Ahq1+ehKzIvUGMYObh2pSZXVa2OWsxA+BxIBS7LArn3mOYJ5RrNWabQ+bCZqZWU7/uO</div><div class='del'>-19dXnE5nOFejLB8KrlrtBUtiR8KBBZzIxmNt9fHxI8h4s/AiMhXvUCdOCjBBv7qu0bZP9H1vNgV7</div><div class='del'>-7Su6jw89hVjDcGOQFVYUNcrioVROy42mDRJTIql7C2Wj8eGyxScLdA7uPV0gWayH+o01mqTkTk9E</div><div class='del'>-vnxGT4Kgqi0PVlx8bsQH6tBJYSDxPkcaEPgu1IhFUSihaFnuuoDi5lj1ngl++dwZwk2q7EdKTKuq</div><div class='del'>-CifQCmA/gI3blh+YiAxq879webL4EHUI8QSRUoaZDDdUFF/lyjQkbkHg0rZG7SlGfsbXMmKcJs2i</div><div class='del'>-mCFEUll0JErTTU9nbnoi9rv2wyeT0UQO/v1+x+VyCSB2zCCIwpPJR5zCOjQx+3HO4ePjA+Mw4Nv3</div><div class='del'>-76EMW1UYJ98p+BYADNt4MDexRh3TNCt5x5aoNlPghp5m4cpwrQmT8o51/UTbtni5/F1BeWbjxPDS</div><div class='del'>-57PVupm+Y87l0Zwhd6rhtzVTXddClKgrVbzJgi7Vvkkinbj9WCMNe2rQt4/ZAhf2NE24Xj+CR1qp</div><div class='del'>-9S83QlVVKLxHlmYqA67rGmVVI8+LQ0RlUCmKEufz6eCe4wLYw2uTzseovz+ZhRpPqtgh+Pz8xDgO</div><div class='del'>-B5MMnhRdIEJt24a//vqBHz9+hJclC3rbNpV19n13wAoIaJVlob5x9DlIzAZJDVeiacQIpa4qTPMS</div><div class='del'>-ar0l0H4nNe0Yx0Flsgzy9iSyGvTPj6tufouLLMui4F1E93MFL6WXPh8wBmvYYSnT2hpE8pM3wDiO</div><div class='del'>-+Pz81ExJXIGGw+flAWMiuJpqCbipIjBmMcF0xljbSXu6ONiFRaOYBX/99QPjOBpzkxW5yapYio7j</div><div class='del'>-iLbt4IsCL5cLTk19AIopCLrdH3i2nQkK8TpyFyXR5ATwmVlcxNrYuX8hOY7PfVdNB1vPlrLsiBA2</div><div class='del'>-Ta09ajHv8OJk8pMtE9l+/qCk8j5XhJk/fz41+PHjB1LVGgh6um1pJOcEezBp0Xi0c6engvc5ltlk</div><div class='del'>-J4Fwwo1N7MGCYY/HQ1+2JbBwQQl4lCuHWmpvYR7OATWVk3INJJhUAxo30MVu8gAAIABJREFUQFWV</div><div class='del'>-8ME2TbIbOdmfz6ec6OcTPj7E146p1+VyRl3XOJ1OISgEvCFNNdLbAKn2UqFEs+41wzBqS4wLgr3v</div><div class='del'>-fZd2EF/0V8cbZhV5Huvz9tni8iI+CQR5WU+fLydcLqKlmOdRuxpW2mr78Lzmqixxf9wPBjJ2kfIk</div><div class='del'>-svRwptX0tGOwvVzOxoh2O6S/Sch0+FlDIAJF78LsIDPm2pyDToLt2PtdSkpmbTGjS1EUhfhIBJeq</div><div class='del'>-aV7QdXc1IJVW84BlmfH9+zf8/e9/R55fMM/PQ0s28iicZr7btuGf//wL3uc4nU7BF7INOpNKRW5s</div><div class='del'>-RTP7tGYoq8G2bGlFOT5l5F+9IPd9h2PKtK1iO3W5XA6KKqtoWgJ9kzUgXxi982xaxowiSVJMc+T6</div><div class='del'>-F0WJtm21sxB9AyJoxii8LLKQ81ADrtuukVuygcimsuSe2D5ag/Bo0F63DQT7Lh6GQu3tNbWk4y1d</div><div class='del'>-YIvC43Q6oSyEWkm9+bqJzLLwHi7PjaXWeshabCoqBCVxRiqKAknQ+0fAMtOSpCg8tnVVLoYYps5a</div><div class='del'>-L1vHIEuc6XvxJ4jsulzTTMpBq6pU7gHReTHvXPV9sJwRk5TNuETFQ+GrMSWNPeXkS/V05s9pmRHk</div><div class='del'>-3l9bmRTh8H5ut0/UdYlT04hrlYvlifoOzssBS7Agme2+0FKLh5pz2UFNSsCVz/e3337HNI0oy78J</div><div class='del'>-dyDQnOMBkx9wInatksRhnu+4hjb2UUrvDu1dcScq1Pm57TpUlVjllWURCTuO/IRC3bDkvmIwbNun</div><div class='del'>-4ixRFu00gNhDUa9HPc76QXvUzmWSChsFk233WbOQrwwyopgAsG7Sa57nFxUKRdUZKbtDQHjl1Kuq</div><div class='del'>-UqWokmYuX4AxKPhiRTSWiMRNzgVMjIM37XOHpGm0TKFgZVlWTQXLosCOHS8vL1JaFB5dP2hrkWk6</div><div class='del'>-PfTGadKIneeFtpxsCryuW2jxrAY1Xw/GnFJvjtphGacJuY+eiGS45U5MNyzKb/0ZyTMg9pEkCZL8</div><div class='del'>-qFOY51lBJZFn1+b5RV3DNVhh2xadXfg8RK7Xm5ZWLK/atkMV3GgpGrN1rGUZCjU4PxwwcoJDn4X8</div><div class='del'>-vQseiaUCzyQXxSxqC2Yc8XSkY1KkvMt1p6FtV5YFXF7h+f6hmdztJmy6W8gQRKknG7SuxKWXrWU+</div><div class='del'>-k8/PH5rB0Udhnme1Xmd5RUD9crlIlqTu2bVK03k/47hr5uBcXPepOfFJZiPJx7oCiy16XCe0fU/+</div><div class='del'>-z//5X/vj8VRTDrFRzvDb77/Be4/z+aInBxcrRSqsU6lbV5useQl24tHuyAcbL0kbl3BaSruRCy5L</div><div class='del'>-E/iixDQO6PohGC4kwe64Umvxr6mOJSzdbleUZa1mDYJnSPvEuRxd3wWXlFm9BdVBxWWY5lk12tSm</div><div class='del'>-F97DF+K0ynsjKMNFFlmLW6DB5iqPZtB1mTDfqImnr0Gkli7hpe8hUOWqracfAGWh+77hdrsbYJY+</div><div class='del'>-+8vBaisq9/ID/kLd+7atSqwqiiKAXfvhpJ/nGVVZBTOWFV0XsyWdCZA5vH98BE/7AmnIPKg/T5JU</div><div class='del'>-/e5YTt505kOqPA8KYaRd2GlGJn4Ondaz4zgdNlN0SkpC5id6ezo08+/2fQte+ZfA7pNSj07ARVHg</div><div class='del'>-+XzGtmySoKrPWGZx7dkCZsJ16PP84DfA05228FxbDERlWQWMZNDNSeyJfgrX201LTV6zDZgHe7V5</div><div class='del'>-0QxBOgJO1znXEvckM14+w6IokDwf/9yfbXsQeJAAQSeY86nRejsi8YKGF0V5kCHaVlXuMvz2+x/4</div><div class='del'>-29/+FvTjz58svK0mO9Y0q/aTu65Hnjs0zUlRZ56eLBektSWnOb322Wa53x94e3tV9RNLA74knrxM</div><div class='del'>-+cn7Jjg5DAMulwvSNMXH+wfKqlTbpwhMrYeoTiBUvl/QZZJDxARjCItuOqTPdpAJlXX//Y9/KJOL</div><div class='del'>-15bn4u5jdd/zsqIqS01Ref8fHx/45ZdfVL02m3KMmQjNPE5NLR2BgOVs24YfP97xyy/f9dqp+rSq</div><div class='del'>-Tm4IMSapdLCHVWgKVhJZjGkipBnKodkdsG1SKcHu6qqcJgl+hNOZFm9lUWAYRziXmRIpV0n3+/s7</div><div class='del'>-/v73vx06Knz+r68vanfPNVuVJdquk9Q59/jt99/x9vamknNiTdZUg+vADpShnPx2e+DXX+PzL8sS</div><div class='del'>-27ppt4OHxLIsaOoamXN4f/+h4qR//vMvvL6+Hmp8i39IK3nV098CtWma4uPjAy8vLxo0qrLEsi64</div><div class='del'>-XsU23M1m2o8VyBQ+x7rt+Py8Kjpv/dFlkZUB/ZwOZYC2Gjbp0d7vN0VRrYjEAiRRMLOYm5VT6uXl</div><div class='del'>-BT73yAJ/XUC67QAokesstEtyvRcF7yLivx0AM0tisRzrLE2Auj448J4vZxRFoToJy9GnSIc22uu6</div><div class='del'>-YUljej+OA7quDfxur4gy68+27XS4CkuLx/V6QOd5HZYOHU8Ah3Vbf6rz+L5GM8uBz4/PnaIuOvHa</div><div class='del'>-dxy177HWJMvQmrRqgNt2TGN/mPyUqTlndgD95KSnD+N8GNwicxKE/EMtvQuALSfqDKNIhX3ucLs/</div><div class='del'>-sG2rHhTX2101AkUInrynqpIAKwq52tC3U8F2QqYkLj3Cv7BlmzUesd2mWILCeChk2jYUyvHtUEJZ</div><div class='del'>-KvBvv/+u8ykKnyvXwe5N+25YEpJfIG3t5QCME5inj8Lj+dSuR547uLLwaNdVQTu+XDHNzAPqWKqW</div><div class='del'>-2+IA3PzcfOmX6MQBBnXdBAOOVfXJtu6z3upH89EFbfvE9+/f0HbdwZU1puDRY0BkwZtaP9t+McEz</div><div class='del'>-a39t6Z1WJcg2IO+rKkvMQQjkMqfKu7Z9hsk3cYoNBUkE7uJCyBWM25RFKKdWXVXB2nsF4IKcOlqK</div><div class='del'>-83eYLsahHBEITBIcHJv54lnL871xQVufO/otZlkalHOZtg/7IFDJUvHhZwAh9iOjukY11ByV3vyz</div><div class='del'>-1Xbhc8Uc+N7HadbgxO4Hs7/oiZAoBnA6iWNOUVaaDUYwrURdVUgzh6oKa3mVcoB6BF2bQQtRFF7p</div><div class='del'>-xTtk07NWJzGMAY7ZrTWIjYKy3HR0oujJ57OuKYKhEoCTn1qEbKM3tZiPtF2vhiA2cFqbcn3WSEJn</div><div class='del'>-KrY8qYBlV83yP1juu2fbHSSVdN+hqWKahtosTX5KL8jg2/ddI7IVLTBSSstKuOj00+P0IerNLYNN</div><div class='del'>-DSqKQk/VwucHQs7XwSPP5xNzAPCinXN2GLzAkob//f64BxpqqSAV/e1Yy4oD66c+wL5/6mfWdY00</div><div class='del'>-zXBqGmzbiq6nuWZ7iNqWrlsWcXYeAcW261D4XFNHEpS8z9VPcZ7jadF1UgtXVS3OSOHZTkZAY3EA</div><div class='del'>-uuNwM1G9xtQR8Ni2SCSZZ+GKc9ITg7fy94dYAxOUEtJMeujKsEZlyUCyCjeWBaW+/pERXEK5tqWh</div><div class='del'>-dIOkJRZZmpYgBfzzn38Gfn+NcVx+AlqtgetkRE3TNGHfN6WXF4XH45EdAFob3OK8xU0di59PwdP4</div><div class='del'>-rOdlVRJOtON2gcUaO17EKpqmhssLNfzg95D5GklPqWJHXdehbZ8KilJEtCzrof1HA1XiD9u2wZHg</div><div class='del'>-ot7+ppfvc/rJL5jDTdtBopS72oXOGXk8EZ/PFt+/vyl4xtSXRpfWStwqtBh5mdo45w/e9NY7UNP2</div><div class='del'>-ID4Rn7kquAItZrGm6uM2z5nRoyeHsUkMPIWmuokuYqbtzDDUAjt4JBzNQdxPPAWWOPM8qf8A0+D7</div><div class='del'>-/aHZCp/pNI3qf2c7Mnw+lOLOYTNwQCafrZxm5ZfTn3MKRXhFZNu6GXkvzyBLU7jc4+Pjh3RedPxY</div><div class='del'>-Ehh0j8NwUOF6bEZvkGqKvavjkWzU5/MRvufoDmx9Irp+gDMDWMVIc/mJ+MKMTIZqbsjzMmycO5Lk</div><div class='del'>-fMCb7vc75nnG+Xw6TCBi4KFxCgfTMNuhyQj3DD0AmCEQeSe4TJZsFGVlcK7UzJL2e5ansa4r7vfr</div><div class='del'>-IRummQj3mkwGGqL0OrgQsZQjmLzv80//3ZL+qqqMcmCbhrOunWYREVTBB4C9Ti5CRk9uRiKnZFtx</div><div class='del'>-Qq0M+XQKjLEWt1N2483flffPDcPJK4pIV5XxoxMDxSi3TELP1B3kuNYEkmnxvmeK2M9BvMMa1078</div><div class='del'>-4aIvC49/BD1/HfCBZVnx+fmB0+mMuorDSPjCv7ZI44y5aCBB1p7NWqxAxWoUWNfaIRDWMo0cAuli</div><div class='del'>-IFC0oQM67YDSNE2xJLOq+5ittW0r/g9ViS5NMQzRzpoppDgWJeofIBbU8RSyAYveksu6oG07FTcJ</div><div class='del'>-0OXD1KD+wLiMWov1MHTFUpG/KhmZNYisHZrm0gaNa4bZ3fl8xr5t4hZ0veosvc3o/RnU6bdg260M</div><div class='del'>-pmUpXQ+xz5MyxBcF1q0NqkAxkBVVqhwayyqEHlrhUfzE+6P/AWcLAFI6SJm7aqbLbIs8D87cELFP</div><div class='del'>-DZfJxOUxrBuLKRXeSwZghw/ak8tO5rEIJwGKOJ7pOKpJUvwCRTEjzwdtfz2CYo9ur7yJ+/2O0+kU</div><div class='del'>-ZqmJFr4sCh2QwEkq0gVwurn/+udfeHl90YxCRi6neDEuwEztv9ajDBSSom4HCbE13+TzmecZHYCm</div><div class='del'>-adD3vZqjrOuqQNKO/RBsyHug5j62GpeD3Rmzh+fzib4flDUozkepMbxcD2CmGKPgCzAbx3R3/aBW</div><div class='del'>-U8J3eChAKhbRnOE4HdxphHX20K6OqMhSnS67mwGxLK8o2aYzDTnwwzDi5UV8GVzmtHTM89gpkpbp</div><div class='del'>-dKAMW/amLRGpg7DdIt53kiRwmWSf9PkT1eCupSb9A6g1WZcRWTYFsZJXVV1sN0Ml7MyM6qpS/Uca</div><div class='del'>-XJApNOPkp2Vd1IVaMKJcB4MO26iuS1maHMBEAYK9Blw793DfYbo8TjsVTOmjI3CNcRxxv9/Epm+V</div><div class='del'>-ISWWX0JMxUU0/YjK26mjFH7M4UPkBJgP4hFbbwtfuzNUz1WBHh3mkOd6StrZdEmSoKkrLCutnyMI</div><div class='del'>-s267zg+YMKEMi04MNUYVKPncY56mA4JvdfBc2HYTWgziK4JuT18rG+ULFsrpFowtS0VjbZvIcrm/</div><div class='del'>-ljwRb0nRNLVKUtkqskxLzoS30lFeM7kNbdsFzoK0UUWVuCjmcAt95qY5HWbqEVS6XC7wuUNZ1ehV</div><div class='del'>-p5EpRZyGI/xeDryoKxn+4nKHx2PQuY4kxHBsFzEIps1MnS1Zy2akYpDRKknLIuzRH284UITr+hTY</div><div class='del'>-jZVmqUAJn8dx34/HzVhylcrQpLeE7RiRmSdZ36yZK9cvW6CPZ6sHHFN/Aujx72fZzKFcdm4+6EBs</div><div class='del'>-MGc2/XxOB/NSUoDHfVJmKolFuTE0mYMIiwe1Have94OYgtJg0Tq8pGmKwURYPhB+uaC/ndEKrNoi</div><div class='del'>-2znUMRAg7LSao6trFlhYucpI7/c7bvdHHEAZggNLjjYstnmehFvfNMi9vBjq59MsVcdh27n4V4w5</div><div class='del'>-K3CyFFNrN0ZugRhOiuqRtTX76lkm4GldlBiUwJKEfjUOBhlfTzkGChmdVaAsT1jXOSi6loMpqr12</div><div class='del'>-Bs15jtx3y70/nYRI4s3EGLLgmFLbGtbKTOdlRTIO8IU3bU7RjGRB0huNZIKyUh2DZzPhJvjc3W5B</div><div class='del'>-3GTLCHdI563PgXWfPnY+Uvz2j3/g8nJBVdWHZ8N1FAeNCPGGpZHFZOigy4wsy1IdypqGMkRS8EUy</div><div class='del'>-ylLGiQEdXCjbmOWtq2zuLJQLfO+BH4c6eG4suv5SpMGDgXiIHXrKjg/dnKjPoOCOGfBR1hwVjmz1</div><div class='del'>-Ub3piwrz8tTMl4d5lmVwBDwW4zTKhcQXbJFlKyqxP8eXer3efjL6/Ooqa80srIEHiTTclCQbUQBj</div><div class='del'>-qb6kWI5hgEUU8WxqxiG/12OeG62NbTtN56av28EnkKgp/05SdKemqJx+MwVuAyXE4lt/PURjCoq4</div><div class='del'>-2G1bz3ZL7Kiptr0JLdlTtSiim65rcb8/0TQiKvK5xxpMW63Dzel0kv5zWQv7q6gwzY8DiEjnYLrU</div><div class='del'>-dF0ceMET6PF44H5/4JdffjlYvTVNfWjZRVPT4xhqMtDEjrpUghbfoxirLgeWGzf75+c1DMTIzKCa</div><div class='del'>-kKG8XHA6nYPg6BFnHIR3Q2+9aewDntHo7EIC3eu6HrgREXBbDP8+zkHo+h73x/0AhNrOyjjN2Pb2</div><div class='del'>-gE3Qk5HXbYMPZw9wFgU9FrnxibEQBCTGVpUyanwYuoP4LkrpvR5cbfvE89mpgI7ZcBtGtznn4Gxq</div><div class='del'>-LvVHbIGwjcAW3mpcX+wUFT5AOrlYE08yx65hehAjo3NORx6rXvyLVzrTRdbSVsOtJhvG/825HKem</div><div class='del'>-DhqFBbfbVfvDtNY+1lS7ahFsGWDTzCxL0TQnNLWUF7f7Q+o2M6xExyzxZMkjJ+B2u6LvC3z//k3b</div><div class='del'>-ilmaIEszXYiWzLQHq7E8F5fmYRhwPp/Vnef19UVFRxwqaVtcVio6jT2ez1YBR56gbN9mUxQWMbOL</div><div class='del'>-I87W4OoTx8AT5I3gbzSgZKvR+yIE40xLS3GpifMI6dXQhyEd9DMgW3MMzL5tWwMOkuicClkDQivO</div><div class='del'>-fYEs6/Dx8SEDRk4nsd4KaD0PEQse2vVu02GrarRTrLwvFNGnJJolHAE6OmUzSBLbmqZJcJi6Pvgh</div><div class='del'>-cu3ZQ+2r1Prj4xOXywXDMOJ0avSz2ZngoWIPWnkHkQtS1w3u96cGWjt1W0lvX6m5bdvicrkgSzMs</div><div class='del'>-WNX+2k4EspxkBg4aFPJl78FJhVkCnXoo8iDCas00Se+0rMOmbnBqGk05rU8eBySw9cWUmGVCUZSY</div><div class='del'>-5zVYhcvoZdsP5axCm3pZVFlqwE3Te6Zdn9cr6rr5Msl3AxCxAo6/8l6kpJfzWX3hSEBidNdTZJwU</div><div class='del'>-E6DvwbFcgEpWfVGogpILiKXKvm/qmWcHX349haLqcvkC/K4/ZW9U4bGDMBvzCVqjM5hzTFZZeDyf</div><div class='del'>-Lqj8WizLTdtods3Z2RTkV+z7jrqq8HhGHMR7r0GiHwY821Z9JOiDMAacJnpTxpNc2nITpinqA74a</div><div class='del'>-sHxVJxK/ii1NYbayBRjbu6sCmwwezHL4nCzQbFV+5ITweqRjIKA37cNs2m8zFErgl2VGXddY1/Rw</div><div class='del'>-MDdNoyPv7RwFgusuKoUInlQKKpDkw8XJ3qMl29hgEF2BZ6NDFzSVclqmytw8TN9sLWjT43GaAnjk</div><div class='del'>-dGCEZTqRw02fwGfbKWmiLEv5Dpcr8KW1PY7ZxsfHhwzwLMpDNOYDn6YZS7oeWnP3+01bWWpH7QzZ</div><div class='del'>-JFB7ZQJzhXnq8fHxGYZvbqpXt0YU7GmTCJXnk7LwGDCHcQy2WO4w8MQOA2HvvQ+KQctKjIHr2KK0</div><div class='del'>-ZhGWebauGxbTIua74nPwuUe/DgfTFNGxFxrg2cmJcxWcptwsH1iPW3/7aRxwPn07UMlfXy5IUoe2</div><div class='del'>-FTLQ29s3aZGF0e7WvYmnLDcvn6G1GrdtywjMuS/PYDVdokwp3WxFE4xOA8vQOl2xlJTuyXiYibCu</div><div class='del'>-ycGUl5uU05dFtOS0I1cEl6F1YwkFXevi6fE4ZDbTNOLzehU5tap1ncrPXRF8x3ijy7KiqlIRdHS9</div><div class='del'>-Ejv4EC2d1d5YtBnaDwDaMIxomgbbtuF2f6hwiGpCuuW8vr7gfGrweLYH+THrabE/jsi5pMnRI57y</div><div class='del'>-XY635uKcpgn3e7Ta4mZpAwMyuu+kSlm2Mw2ou2edH1NK4HJ5CdOIZVAjwVJr7En8gkIUmTnnfzLT</div><div class='del'>-oOEpuyZ5LqaQXdcpSj6Og/jFBW65tTi3nP4sTZCE+QXkpdODkNRpzjRg/e9CO46dBCvKoRkFZzpa</div><div class='del'>-4I3OR1ZbwEPA1qj0ILBrh2Ufy7J1XRV4Y6AhxmNVoMu6wmfybmVq7in8vASf2+2mwVAA5DRYsaWh</div><div class='del'>-k+PVZanvOwCZli1fN//XrIDu1nT6FX/IDPPcSkCZJlU2fi0voklJbG3yGfJgsfMGHs9n8M4o9NAc</div><div class='del'>-Qxlg236abYTsS8q1aAqbJKkGDHnmQjWf0hTu/eNDp7vyNBZGX6dRjeDUsmRqkUxZ59eJqJbqKewt</div><div class='del'>-eWjP5wPzPON0OisDijdaFPlhjJcFFY+TdZaDbtz7IqrcluWn4Rl5XiBNrwe2FcVB6ZcBpmLIIDTM</div><div class='del'>-OXDr2RmhH53lsPNF0aCELZo8EDUYfQlqMSUvilKBnLZ9aokVDR7CGKfA3ovjtOtgcLoq2ePrZGG2</div><div class='del'>-GDlrsAv++lE8FUdcdd1oHH8z5RtQhZYqsy3Tz0jTTE1R4lTiI8BrQT3LMOWCFSxC/Bzv94duVH4W</div><div class='del'>-dfZrqOH3QAbb9x1//vEHXoIybhhGtOE5iH+DD+amTvX159MpmKPU2NZFyU5t22JZCni/KlIuGMNo</div><div class='del'>-3IWPQzvshkuSRGcXLMuMJffKKIzlUHIwIrEqQjuQl+tShsFU2hK2Za5kzdMBRLZdm7ZtFWvRATpp</div><div class='del'>-prZvljkJzCHQBvLYf/zH/9zJCnq2XTCzLJGkaVBkOYzBu31ZFjyfbZjNJ4YFfGjHgYeZzoK3qd/z</div><div class='del'>-+cDb2zekaYr39x8oy0qdWOqqRuYyfH5eg4KqDAi1zIMH9p+UbtShcwIwR2ZbNSFtzGKdK/W6kFHc</div><div class='del'>-oY63TjfWEVc0/rmiul812naSLt11qVGvgmVY27UHFtbRxyB6KkRHn0KNGy2ZiTpz61tAHX80Zt1V</div><div class='del'>-F09jlHEcMU2jYjFxuEkWho44FScxq4qU0k215uwc0DCTwYPfSbELNw9PJ7LTxKNOUnFq8H2eH2bt</div><div class='del'>-cYaBOEB5tF2r0tbX19fgDdDj8bijLCu8vb0iTTPcblf1aEAgbbVtq9dvS1SWunxuLJmaug4uVTCO</div><div class='del'>-zOu/sCHbAvV6EHelIjr3tl2r921r7iRJ9UA8qmGz8P0OhS8wjIMBLhd9nsw+hbGYHHwoxDG5wbLM</div><div class='del'>-QTi3qmAvDg1JA3gYuTHJ/fb7Ps0LmrrCQO//VNoa8zyhbTvVv7NOfH2RyUGcMW8jPNM9ors/fvzA</div><div class='del'>-v//7v2uq8/r6im1b8f7+gZfLBTuEVca5Z5Z3fTqd8OPHD7y9vR3qTpmyKiafFnuIPvAxIH18fODt</div><div class='del'>-7e2gNZehHq3R4cvvcNKQ5btfr1e8vr5qGTAbW2YL7nifqzXz7X5Xrf7j/sTr24si3ZRZ22zGLk67</div><div class='del'>-CaZpQtu2+B///u/aY2fJMZsJP01dhdRwO2AkaZrier3qwNY4tiyWbtbZ12o6uEg/Pz/x+vqqGoz5</div><div class='del'>-C6/CeuuL+5P0zdlqbZ9PNGGQyr9C34ntfIZBrza4SxfljtOp0RKhrioU5QW321+YphGnpkFZSe1L</div><div class='del'>-7MTOd3w+Hqib5qdMRNx8Kjyfj58Gb9ANel5WvL+/4+3t7XCiM2vj763riqaptZVq5fVcf2Iykisu</div><div class='del'>-EudPxmy38DnKqsb//b//N6D4NZ7PFr/88t1QyKU9OIzTAU/hcyR2wvfZPp/4/v07HsHkxLItAcBx</div><div class='del'>-019vd/R9j8vlgqpqtLaxeu+mkQsqqxpJkmNdn0aS6w5tNEveIFghqqUWZZBg7thRFDWAzgB61mcN</div><div class='del'>-yDKnUU5ntgVvdXuyW/Se+nAGAmuX/NU+yfoTML0qy0LrU9u3JYuObTi+ONkoV508a0lO27YGiSj1</div><div class='del'>-DKL1Xr9oA76OgiYaPk2TTGoKYFUenJWI/pZlcQCcrFTbBjcdpx3UkFys/8qWiwGNs+UZvNc1+6nP</div><div class='del'>-zZ9nK64Jm43ZDi247iEoCkchgpTTNGPCrNjEV0LSui4HO++u77FjVwu3cZoxzXcN/oIHedyCPoE4</div><div class='del'>-TDxRJySJUL27/tN45MvQl74f8N///Q98+/YGH6ZG0TSF+EC0hJsUCCQFl0GRJZec+onyQpq6wrPt</div><div class='del'>-NEiQkSr1/Yx5eQQMK8WpaVREx5JsDwmxlOLpoQMnEn6nWAeDOPUp0s1xOm59WRa4ZRGkVFh8p9A/</div><div class='del'>-HrXG5A9S5kqnk33rvgyOHA+tl9QM4WSUJEj18Sn9+T///CdOp5M5lVbtzSdJIgNEQokg6WyhqSRP</div><div class='del'>-Qp4iTNO34D3PDe0NpkAlldV45+GkEuIMlXlVCEobgOTgN0jEldr2SCIRk8g4508AmH4Y4IsiIMeB</div><div class='del'>-wmkWJUFIKzeldJQb1g5ykA0sL14ARZkqy2m5dMLhzHmO3SKISRrxviPMTJTgbN8le9oSXNLDyDfr</div><div class='del'>-BG1baBRInU4NtnXDSkPWaURVVwrM2qGvFuylLiBJU4zj9FOrkP9Okhclu3zOUfItxibXzyvSLP1J</div><div class='del'>-iGVPR7FHn0JWuil99/v3N1wuL6Ek6oO2JcrRrW+ilX1XVam28tFMZdN1Iy7Qlo2YHcrPyGcRK/2q</div><div class='del'>-PqF8tjrAVP0qtk07LV9NR9mVmCbBBshDIAZh5xns+47UuRxVVemH5yYSk8nGqb0+tCM4yotDEtkf</div><div class='del'>-jidanGCyrit+/Pihc/SskolZgzi2LD+9rHXblanG1Imbre97dKFWTpVVOGtWUJbiJGv5z5aTr2aL</div><div class='del'>-4fNpMrpuO+732yHVt78XhRjHBcFpuhy3TsdZAm08GcST3usmsK1QO4SUcwycy3TAictcSHVHdSDy</div><div class='del'>-uYNjOyr44lPnbqWuNAGNWU4Z3umR32GHoc7zopkXXY6tmIpqTQYZMu0oMrLybG7Qy/mMsizUsZlE</div><div class='del'>-H7oJP5/toWWZZe4g/Y1DYJ3Kzu1kITG47VFWJS6XC87n02HoDdczr+lyueAcphaJv3+JtzBZpyxP</div><div class='del'>-B/SfTDy7RtmKnOcFj8dTXajpv2cZtELr7UwJhIMk/Xa7KmYhdnI3Q2mfD9dCDEls2rYwtLaVwzaU</div><div class='del'>-mKRuq3Q87I0D5Vi90KpSFWRWz82UegjOP/SAiyOSJv3/Nn3nQtp3hCmuhf4u7YjeXl+lregLVTnZ</div><div class='del'>-aE8vAm7651NYgefzSWiiiTDq7gG85EnlvUcXzCj7QRaDdXJhGkgMQLKODkVRqt++de3liWxxEEsb</div><div class='del'>-js4swGJGZ5VljarsjCXWgmVxGJbxsKj7vg8TZzgBGZqyZwEg6rpZTzzy0ykl7vpPdYO1p54IdyrD</div><div class='del'>-ghwOarA0zOKL2vdFmYw0WWXwJ9hlTTyHYQwjuoWyPAYBFrM4S0JSv4hhQO4yvL2+qkks3wH5IGzJ</div><div class='del'>-FUER+vXk9XkQugQSVVmKi461KONAzMezC6rPWTMcOuJeLi9Sjrochd/02uZlxXj9PIC1KqAJOEMc</div><div class='del'>-1gE1rOGhR9qz+GA+NPOUCUtOMQprVz+rCUqpvn1t2xnLt/wgmLKIIQQ/AAAgAElEQVR4lJWYW5KQ</div><div class='del'>-cw5rIPHFtYqgkhWeibNtnS5QM6mhZw02TrNuDGqsWdvbIYxpYHxZiiLNOkkCUmPCRcwnkzTFNvQH</div><div class='del'>-YOJ+vyNNE1wuL4YZmOn8+JfLBS73WOZJnVNInIlEByiTTySZpTnhIoFjmhedAc/R5SRv2GBkCUCU</div><div class='del'>-cHbGQoyL4n6/4f39E7/88h3ruuF6u+EtjZZVVVXjzz9/N6YqcR79uu2aonPB3R8PpGkSXGbojJyh</div><div class='del'>-rkr8eP84gJbrtusJamcjdIEpyWyEpJiPz4eeelmW4f3HO85BisyNnOe56v6ZEdgOCPEQGagxw+fi</div><div class='del'>-28gTh6egdZwi14ODab+ebJRaU436k8OREabxfpZlhi+qQzdnnKZg+W4UroYdKAM2Ntzvd7TtU+t1</div><div class='del'>-uvyI4/OucxKsiSxxrrquUVcVXO5Vb8H1b6duxdFz0V4tdlicSuHrqkLmHLpbr2uZA3TjcJT5y3DV</div><div class='del'>-JI4tK2XWRB+MU+QZtJoVs81Mta+bl1VPbhJWvv6Jtd4WZIZH8QwNIiUCDQe0lYYR1hEndxk+Pq+h</div><div class='del'>-fXUcmWz9y05Ng+v1qoYj7BFnrkCSpDryymoEnMvgMheYhwXW14u2lZYvDD8uJC7i86kJ46qXw89b</div><div class='del'>-U1GaKwzjdFgU0Ywkx7dvb3h9ufw0YRcAlnlSvkBReIxjNPgovNex6V+ppKfT+dCNyVyOl8tZjTQi</div><div class='del'>-kWs5DJs8Wqdnx5FaYXY9vR3Pl7NYUmVRpbcsC+gaXfhcrcI42IXZwPpF8h2lyz22bQmj5Eql1RI3</div><div class='del'>-spwMrgWxPj8DODrwWkm3tFkzJfm0Xa9DZqws3QaQ2+0WMosytJ+Bx6PVE1b+zh9k21zH5N5b3j6D</div><div class='del'>-yrIuat9u/962rSMommrLU4KX18Om7wc81ShHMj7sEPXhNB02vR1uyoAu+M10yAasJJ9+Cl0vGFVd</div><div class='del'>-13BVWcq4o/BiCBZZ6aytvXixkdQh9eLj8QzqrdTYHe8HGir/d17WcMrEmXN22qzM/ZPSgHRZPnwx</div><div class='del'>-wegOhA2e5sIN90rEkDSqx7/9WsMXFcbpfhBlsPVjh5lw0wzjpOIKG/Gvt7ueDl+n8/KlNk0NXxQA</div><div class='del'>-UhSFpPbDOClXn0w0EZFMCgSu66pRuiwKLOuCLHM4n0+H2rM3zLt/Vbp9FTTZhWlprczGXO4xTbOK</div><div class='del'>-fXLvkWiqu+q0InYV6rrWqUKbWXT2e2zwaZoTTqdG7dPiXAh3UA9yw0lZ1B0cc21ZKsSXJJCUNqxf</div><div class='del'>-5gla5uo4jihLH8qy4ECUO2Uq8hmxBZjnhd6PrPXEyIkz5REcDpI1Suitd581+7SAuFX90XGZcSta</div><div class='del'>-z8XBMMyYvlJ8efgQ2CZdmlgN9THcuyyT9qAGzLIMjm6y0TNu+3r+ayq4GwYYgRXKItfgviqLesQ0</div><div class='del'>-7Tqa2XriU1giixZK4eUpxUXzbFs82xbrGhaLc8o+/Ko92PddjCXmWeWa8cWsIgJZngeMIU5ZcQf5</div><div class='del'>-8VcxkGVY8WXyeUT6K6KWPHgr9P1V0+stUJelD5yrMEUox+wDzz9ZQAu4swRvvB5+oXFnqtF83SQo</div><div class='del'>-2uDMICwL4XhCsFQhAj+MI6bHXYNZ3w+hbo0W3Uyzh6AHkXJvPIyqlhN8PDDZiA1RSTmNoxKQWFqk</div><div class='del'>-LsO84IC9kKdAMJNmnbxG3cihazAZS3H6G1rXIg67VbPZQHrj5ieLU+7hph0Vmqx8HWpqdSuWLajO</div><div class='del'>-VcGaXuYULIqtUPdveRq2nqcG56se46DgC/6VLH+s8jJyKLKg+BSXLJbu0zypjL6qKpk98fF5/ekD</div><div class='del'>-rMSXbQxKP7/SaDnvj+lYEVDZyATLdKqrcgpCe4wofNd1OvSQDz8izvLgWOvboZI2ABCJJw14DESJ</div><div class='del'>-rutRFE/UdXMYXfbV430YBqX13m43DRDkBezbdrC05sx3RnGyBC2VOXcZljm2WWmR3ratlgZ2s+d5</div><div class='del'>-PMHuj7t6GpIYxQ2mIpyiwhJ0HF+djARLueF2u+P19eUnBqV122HtG0uJo1GKXYzqyhPKEw61kNM7</div><div class='del'>-6icoJSe28Xg8Dy43DOg0FbVINYMVA7C8n/mghiODkuPPLD5gefwqSksTAHJKcohrBChrBbvHaVab</div><div class='del'>-9yKoD5n96cDW8HwpE7aMPz19DUEqBpP1X1p8W3MPBl57D1ZQtaWpll3cyJI5FsZ+3R8wHOJWQ9AG</div><div class='del'>-HAxXN2O7bKOSrf95obYXTdujiLx6rR01SucOQ1F8+Txo7cfNS4loFQZasl2278D4BRSLfey4gezD</div><div class='del'>-J388erhF1Jt1lF3YNnqTK872EtV0CRIs27FfO5o00Fp7FYUXEGYYMM1iJMHJQmlwVeYz4kkiL3c1</div><div class='del'>-qjVxc73fHgoECdaRq2Js2zZ8fn4cQC978oq8ukBdN8ocpKbBPjPBZ1Y1lVzCc7QlBKmkXDz25LXp</div><div class='del'>-PrGM1KwZtmEZJHT2Y0C5o6TYh9kGo9bb9hmdz+fAJfHhdFswTbNmGZKZpOrFYLM4vlu2ZkkW2oxQ</div><div class='del'>-x7kMvigwBExGSEDWNCY1gjinY92SZD1I4ilEIo/Cbr77/X7g+8soufUwlUr9+l0GIAvDUrPQEnZ6</div><div class='del'>-PxYYratScIIgGV+COzefa+FzpYMTMKZxjqP5pDilLEr0+Vrfkk+dJgm6kAbKB63GA/3o7rIZ1xid</div><div class='del'>-XrNu6gnHKMb6yhcFpo931HWDsqxxv9/QDwPqudEHZlFWLn47yGNZZvx///gNLy8Xcc3xPoy3LkVd</div><div class='del'>-Nk5mfLQ7ePbzZKLayxcF2rY9eNLbMsECRbE2mw+tLVuHczQXxVHW1ryuG5RFgWfb6si1b9+/YZ7E</div><div class='del'>-/5+Lfd9z9Sakew/rwK/XU1UVsjQT5uY4HOjUUpJ4SQ2nCW37RJ/GzWgnEX2doDSMIoIpitKkwrNS</div><div class='del'>-s9nGpFCFhqH2uRFXitOHEXreErQj2p0dCFtZmqHwCQbTiv461coOkLHmFyxH+S5cRixgPhDQqBHg</div><div class='del'>-qc9yhMxFBm3bV4+j46vg8e/Vx3Hddnifo66rMGZ9PkzAsi5ADLBUgJZlgaY5oa4qXG/XgxFIDOCb</div><div class='del'>-OmNL2TNrpruEUW/rOgV+wq5dljzPxRIsTVNMs+jOHw9pGdR1dhikwDRx3fYDsYXkkyFciF0wP368</div><div class='del'>-o++Hwyw9PsijJJbqrmhH1rZPba9ZR2I7hYUtL2vaCQAvLxd8+/amc9+psXeZE+KME0FLbiIqh2Sy</div><div class='del'>-ZfT+8R4EK7OmmdZdxgKQthzhNVg+uD2JYpsJ2nlY1y0AfvRZyHWw6rqJoefRtckfamXnMq31nHPK</div><div class='del'>-5HPOYZon/PjxV+iXi5lnlprNV/g4Cs10R7iJisBPkAWWHdyCbPBMEqcDLOycBp6W1obNTlb+66+/</div><div class='del'>-cD6fo/ErnY8zh2EbA4hawOUe+zCo3ZcFGdkCoyqw0yG1s25YUqfZ8RGcZoiDaQ1VnFmWXG+C//zP</div><div class='del'>-/8L53KiQzaLr0zSpHwXfjfxTqAU6SzySxWgCop4YaYItWJ/TacrqTcqiQBaGfjKLY1bFk57j4PmH</div><div class='del'>-bFViZkLlP4lJTe71ObphnJBMs3moW4g69aFlFDe9oLCcpEpSECM7qajjOISBlssh3WHQYB1DW24h</div><div class='del'>-7qS6MLkZ0jQaN6rrbdfjX/2xTLXCe7i8Qtf9P1wu5+AkLKc39Q92SAcdXSJYlunJOhlPdW4yCwAy</div><div class='del'>-Rf6qKrTp8dfWUVmWuJzPYlZy/1DHlji2LFU5sLRsKh3RTR9HjqIizZpuQQw0tIKqqko/b1mWsNjy</div><div class='del'>-AzI9jgsu5zNcXmCZR6WzzssS/O4FB/m8XsO7Lw8Zx3FaUjQ44ffwmc3zruOp60ARJo/gGdaVdWdK</div><div class='del'>-0wzvH++hW7R9acdtP7np0hAkalGkbKX9WFmWmpLHISWJthOnedESRk72Dedzg5eXV5zPZyX28DsY</div><div class='del'>-eIgfqGah61BXJZ7PXDGxRTPs8UDbJm5Bl2RmSHyPNMXh5m/qSvkFTdNoJ4gDZJQvMC9o2xYvoSWt</div><div class='del'>-hKwtEpucbfVxuAL924QxlGgH4I8//tTU5uXlErzinBmuGMEdaRcVyNIMp1ODNnjYc8Fdr0+NxgTw</div><div class='del'>-LOuMwxGmaTRz3Y6DGQofhTEEPFh7fXxekSTXgxuvTIzxPw0kYfAgFVhaRyGCLueDSQTR3Nhf3dTD</div><div class='del'>-7XSq1SSEABk3iBXakEBDEY1kH6sGv2ledNiHc5mMjc5zlIFtt64kxcQN6L3gD1k4ebMs1TmG1Pwf</div><div class='del'>-OR170IWPuoHarsM8X7+Uf8kB1CWxh3oEdnU43TfLsiAnd8FT4lgujeMQgq1T34N9B1xeAGg1UJSG</div><div class='del'>-5861QQovS0gmAHnoJLAEsziUjrbLMqRprmzLaV4MczRXgG7fd8WCJBjnaE4nscnLaqzrVe+bjEK2</div><div class='del'>-7fh7zJznedVTnpZ3mZp2rIf3YEtFrk/ibLZU+Aoaei/Y27puuF4/dUYjcTW6ekn5uCneRGOf5D/+</div><div class='del'>-43/utoYVf/3yMCJ8DPpo6RUH80Uk8IUPwzgyM1v+OOtexRDeBwnrri9K2nsZfrz/QJ4XMqopc0FP</div><div class='del'>-nYeFRc88KDjGceDn0xld3+kJ6DKHx/OhrS+2mpI0RYIE4zT+Cx+8yOsW9HTGvCzB9y6CQOy1x0GP</div><div class='del'>-KR6PO7Is14m+7HdTVsw2DdtxxFEsEkwuRTxNUwUEI9MrDSYiSTAI2VVbz+zEAntfSSixZ7789P30</div><div class='del'>-AyBoaGfZcwNMhvrMkquuKnQaqI89am7A6K+wajuOugHOPHQux/3xOMy453VFVuoaAlyB2+0WNwPv</div><div class='del'>-Lxiu/PjxgaapzKjsaGlGZ6c0SXALRiQEWKO+JTvY3H0Fwu0fu1fEO2HVTpmMVEvQBsUls8CXkIkm</div><div class='del'>-gV+hMzPC/uI6oTv2um4KJEpHaNYSmV4K7LwAO7qu17mEfNf8b3aYbgSvMyQ/fvzXblsOjFSsg263</div><div class='del'>-m6oEqVLKshLbNqmX3uPx0BnwtBVnUPntt9/x/fs39eez6KVMRsnweb0qgYYnEk/59/cP/I9//zum</div><div class='del'>-ecLj8VRzEdqAaS0TrKCSBKjrRk+Sru1QlIUirBKIlujQE059m3bZCUe///4nvn//pq1C7h/v43BH</div><div class='del'>-GUfVBopyjvv9rn/3xx9/4m9/+zf1R7CgFFNwK/ckxZcn2O12w8vLy0/26+y7d12POohwSHG2JceP</div><div class='del'>-H+/4/v2b6hm+moNajoPlNvRhtsE4TrhcLgdFpPoKpFGXTuDQPkPrp0DpLO/VuRyf16ueVn3fKwIe</div><div class='del'>-uewZ/vzzL7y+vpiW2ao4kJSDYlpzu91U2ccMripL/PHnn7hcLrpGCJYyo0gSwOdebeB4QHATPp8t</div><div class='del'>-zufzQaU5jkOwiPdo6hpp5vB8PnC9XlUVyUPmfr/j27dvOjglScS3kid8UcgsjKqqBA8KdHCWyl3b</div><div class='del'>-4du318Po9ljiRT9PAs40jO26Fi5z+O333/H29qYkJckmI+nOsX3Di+dY5qostSalNZjPfRB5DPrF</div><div class='del'>-cvpEmyO2ffiyCPhVpTj8ECSS8U1DHP6RO+R51OHbFlTX92jb50HDLzW+B1QttejmPzV1GNG9YhgH</div><div class='del'>-mVYThkAImShGQk40tu1BBgdiFbF+FkSem5mZUlFI4OIkH3YlODuOo8snM8PP3h9fBkk+dqbdV9KI</div><div class='del'>-BSJFyRnq7nCyMfWLQyLlc3789QMuz1AUL3qv1kuBPXfrceB9gX07jnG3GQQzJGGDugPgxABqrcYI</div><div class='del'>-3o7jFMo6KNbCYMxOibSpFjwedz1lLeloC179fH5FIRyLl5cXbNsaWozC5LMgrCUcRfWoZb3CuPck</div><div class='del'>-hs7tjGV5tKMbpwnbNpiBsT7U49FxiQGXlGrrhDyOowaNoqzw8fFxsFTvhx7jVB+CKoVrhc/xeLZ6</div><div class='del'>-P/QMnAPethhLtyiq20NmKjMgHSMtraKyTFpOO3Y1FhiGAbfbqJpuSw4Rk4czzqcGmSvU54xAFVMv</div><div class='del'>-C7qx3pZZ9O4wJ94SfexC5hRZpukERiyPoa4bNHWNzOV4tp3KI+u61lFX0zii7wdM06iDLKn4s044</div><div class='del'>-rMNsKl0UpbCnnAQAOhz3/cdhkfEk4RwA7/PAaoy6d8EahpDmleY714NvnO0kWEqspTL73CPNUhTF</div><div class='del'>-pLyHvh8MGSbD+XIOLdGL4CohGFlC1DAMSpDJc2Gz9eaebDr8r6zD7WzBI9FlPbSq7Jw9BvN1lVmC</div><div class='del'>-3ueHNJyuy9a5yA7wiMh9rhOIpmmSCUah5CCBinoW62PJFjSZnNuWHTo4VBuShcfZlefzGdu64Lf/</div><div class='del'>-91+oagk+0lLPkWbuYBdv+R42i+IamedZW6HExCwoTMpyFCJlBx6LzSitqzFlxGRfns9npTsnSYem</div><div class='del'>-acQVWOoWr5NLpUVVHF4onVwIbhHp54iprh9Q+CjcICDC0+7H+7v2fkVWWhhTxPRAjrFGEcBuXFPT</div><div class='del'>-MBSz1ZrVLqhlWXC73w+8dbIR123H0HfaAfC+UAMJIut86WxbSls0MywtYbVNfa8RWrKBFc8wjoky</div><div class='del'>-1I/Pq57MWRoZYZSF0i0nTTM9+azd1DzPWEL9b0EqOxiTp9YzcOOpMS+81ynMPNG99zg1tbDn+uEQ</div><div class='del'>-VGjGYvUMz+cTt9uIeV5Q1dWhNPpKoRXAeDBDXqFya1KZv+IBVqBDkdft/jjoQ+hsRL2CFfvwfXz1</div><div class='del'>-epD5hXkAA29hzeYGxM3DzMAaWdYFt+AMaTofAkr8nkWNWTZDiZ+mEeM4oTk1KIoCTV2j7bqQwYz6</div><div class='del'>-WdSSMBMehgHX6w1NU2u2xnUo/pqRRflVy6EGqMHLIUszJMmg4HucaJXpXoqEpBxNcwrDYsxId6ZR</div><div class='del'>-BPs+g922Pc2kxeTDF8pmZ83JsUUSwccDWEL3Fj4w8VLP8Xy2ivjKaZIc0zsTobl4+bJ5vYzMlopL</div><div class='del'>-IwXWR2VZYgumE23Xo+8jy4zqu23bcLu94/+n6017JLuSLDF7++pLRCTJUo8awuj//xBBgDCD+TCt</div><div class='del'>-akDVXWSxmJmREeHL29f5YHbs2vWgCBSqm5UZ4f7eXcyOnWUcJ3p6etJxECcDh5ohh01r8+tsICX4</div><div class='del'>-1kWea/mHCQpsrVHmvn9cVPGIMhHhnZg/47B9DHTAYnAhILvXN0Nzb9OeccDd5bnb0tYKcdjjP6ZA</div><div class='del'>-DoWyLGiefFILtw6zlPaRVgrzPNPhUEuoB3l++48Vo61icHuBploUpQLOeIbjNKlxC6pIjMRQPblo</div><div class='del'>-d1Za1lWpXA8c1kg3iuOI9m3Ri8uOEm0lh8+ITYzRI1B4cC7KsqQkLWi53eTvLB5LFFOZ799fKY5j</div><div class='del'>-quuSXp5fuFURNec8z5RmGd1u90+HkMXOwPJ0GQaRZ5HPAC63u23bKv+AcyrYGRl7cds2xgAAKuGF</div><div class='del'>-ATCzXu/Q+btRhEN2YYVsyRFWVIMSnvnwpQKF/ABHT42HGCoHBCVqSx4abzVgEs6vblWFHpKEYIF0</div><div class='del'>-lYcK9RSAP1QS4B/YHtUp5za1/rIjyGEY3LjQlHHcQ05qUnEzNzV/TtIbD1TU0Yx6gAxvW0j7HilB</div><div class='del'>-ybeJ3kVYlOrzxZx+HBdtNZqm0cWyPQiBHg1IAUrNcyyEmZROpxP1wahmp3bmDxwHseU/Xl/p5cuL</div><div class='del'>-5hUCcCUKPD+9R899a/2Oag1jO1irPTozqfdfnuuftyNDbKhhGGmSMRhKfLD59njzRER4Nvg8bgMG</div><div class='del'>-nv+ha00iWY/8Xseh9VqHbduoae4uMi5iXX9ZVkIN5ynFuu2UZ3xBQdAGNSHGgG3b0O16o/PTk6Yu</div><div class='del'>-oRLAZWdjxwIxDQWYjz0FvMuOeUN7+uOWYsAs9k5DVf+JSw8UgDY6ygJP8F/nYMjMZKRvklePfjrW</div><div class='del'>-F4+IJStZtbpuSHRxKzats9oehSiBPgkeB3aUk+qYb/Xam7Is6enpTHlR6xzVDHx0AfaSsGv1CrDR</div><div class='del'>-jiWOuesHdyhuK72+/vhUrsK8I01STybtnl/4SbzTto0GZEJ3AFUlPtMoM3B8ToREoBR1nIDYEEbi</div><div class='del'>-T/+pqordcvJcrNd6BdBwuINB2vcDh7/UtRhskNjIL+I2tHsXh3VDBu9DGW9ym4PXjyzJNIm9DESk</div><div class='del'>-UAcB6eEE23o1E92cchM4D9o9ti3rPU79o/QYzxSjRJ9uHOmhClUdzEgsc9UlNbGZKTIheDryRvf7</div><div class='del'>-1YTgoqUWu7Ys9QxssfmxrqEsZStxfkbWh8NVnCkfyqtLz3b4EjERyMk5wY5KdS5uOdzoq/edRz9F</div><div class='del'>-kchJtdKvv/5Gz89PdDgcnGyxquh+v+tm6/tBYrVLjdp69Eez1F6UNDbk0c6o2TQhdTLPLGNTDenH</div><div class='del'>-+ecE+hKsGuty+eDgR3OLDMMHDRK4WRSF52nvwjFCKXnZ+gktR5rE9OPtneq6VrIGK/xcKrCfmjsr</div><div class='del'>-ucbX0G/euAxceFRYPH/vFWdBdYLfta6JuPNyjPftduP3GAaK2o+jy3Lo+14JWbj5DnWl+MQw9FQU</div><div class='del'>-+Se9/rz4Go+npyeqqoqWedbUXOslADegYVw9EBEtRJqk6ksBezXwPvjvD2rn1vedSr25l49M5Fek</div><div class='del'>-LlBWIIaEXPzvqBLw387ZylWKVmNhS/FhGBUwTaW9tNmaUE3y2kDlxJVWPwx0vd1k7p+KeCiW0XWi</div><div class='del'>-I1g18RSS3aGu2adBWs9hGNUSDWvDqhUxmt3Exuz97Z2KMtcLbt34z8Q24NOJc5hDHppwDZiEoFyd</div><div class='del'>-55nKMlBWXFWVVFUV1XXNltNSMtVVpRRKXkSJztJxG9jTj0u40AthsMIUoJ3WhBSLMMt4NGhzAdjq</div><div class='del'>-/ED7HgnpJhUPu1yps4NxLHKRUu52dvHMuaK1QGbTNGE1VlJQ1rRK5QXACc4/A3muzLSsRNs2WZtp</div><div class='del'>-LtlWSVRiYVOSZhQLddkiyxg3RlFEr68/XF7AyNFaVVno1AXPEN+VGZ+VVnZfv7K5S1VVn7j8uP1s</div><div class='del'>-6AvGZ7fbTTc/gEsXsMGx1DgM7G0LHYh9lzxSZlLUXay1kHmPYBEGDJ1lmU3KgQVa1/VUVZU3vcLa</div><div class='del'>-wvjSUrgt4BxHsbL3bAuC8ttWUuu2G6ffSP/3QWTvmG7ZdGsIthhELDSQZNsSz/U5inh83d8Gz7vC</div><div class='del'>-+idYF6OyKCQIN9KLtaxKOh6ZqwNW7rLMXAFALqqGEjKWA23Qesjjxq6qWmWGc8AmlezAmtO63jXJ</div><div class='del'>-ZBgGOk4TWxEJWJHnB3p9/eGJfJg8FGoaikV2MZKzBpOgLStoJ30ebmQAPxwRxqQVlL+7IPJ1VVGS</div><div class='del'>-ZjRI64A+D6KSpu0U57BhpT7wlsi/I32RYRTTNN/VVUZLQnWB2fRmt+iu9TLwcgMjFz5p1Wm2ekN2</div><div class='del'>-orVqw8+DswxQ+vvtTmVVSlkcCjgbu8joOKGThIlcw0jjvOxoytqsYzGCm2B9BNG+aWSVMY191Njr</div><div class='del'>-xGbdNGAThJjHDIWiyCkg8eIb+0/WZ1pFmXeKdhIGnlDPYWrAEvRdBTnLunhkLbRTuCiS2OUesNkH</div><div class='del'>-H0zcEmS0yCQMpqw46DlGnVu4XQD2e9PS5XKhWsRhPLp2PXxAgcqnQZMvC/bhcLJlaYdWHl9/+/am</div><div class='del'>-nApWfbKnwjRNVJUFY2YWFLKMIi6LHOEEDx9iiFQAM5sW3LYdJfHonZT4QNM00/VyofPTkzyYUD3+</div><div class='del'>-0dep2WY/fJoxwzXHEmkQnzWKpBMKtT+LcYpCB3Au0n92fU/RNH0yV1zXVcs6FrPMOo77M+ONeV5U</div><div class='del'>-3YUJyWNYB8JBITRCVQDHG5SvURh9sunGs1/Xjdq28VBiHnulOp6Kooiens6SmJsb7n/EPonSV4OJ</div><div class='del'>-Cfnyvjsch8vmlfKiVFoyAipwOIOQhYw7bFx4Ntgb9zGVJwgCent7U+6JdbIJg4BmM3K0Y1M8f3bU</div><div class='del'>-nSQHcfFGlJZYlmaZsWeP1O3KWtYz/2HTdOkgcN8H4zhMZ6zNF/NjNrXEWwyAh1g9WKph6mPXA3/m</div><div class='del'>-SKpf5trUNVfLACxhggNpsjugY5XPL/NC96al97c3Op6OdDyeVGTH4DQnDg0S77euK1VlIXTk2caD</div><div class='del'>-r+rIC4VWFEU0a0+2M3ouNEdIZYlmz6hxniPvg76/f6gO+/z0RE/nM2V5TenoYpuxYcZxUsNELPCu</div><div class='del'>-42gynLpZmqhL8b7vMn/n8RHm7HYzY9FhdAbPABvkaVl21tgCB2El0cq8qF2pCTEJbnTYRyEM9HHs</div><div class='del'>-ZUUd1iFGzU1k5PXIuLPUXme1xZtFHV+i0EPL7/cbJUmn8/pty9XwM05iut8bShLmsEPnsK7Gv35Z</div><div class='del'>-aF5WdUq2cmFr+LpFkdrGXy4XjVjHJWG9Ie0/rDitqCxy+d2rHpKP8mkr58X0yB4+jyPSbWOHa1fF</div><div class='del'>-bjpWXB48Kyw+AeDQsjTtQQ9cQenIIujCz4TZBgOTzr7Nkna4Xa6pKguK4kRFX2VZUp5llGY834dd</div><div class='del'>-u429w82PgxucgjAM6XQ+i5aBlE7PMfQ73ZuW+r6n0+kknIqYFolKjyFdBNpYloUKdYZhYL+5xCHq</div><div class='del'>-oMiCLMO+Z7OO2VDK2jRavHCYjsTrpC9q2zYq8px2CY20RCCrBNMTXiSe0xRqqq81C7HeadyHB+qE</div><div class='del'>-Yo0imKji7MNtxWL7rL7nHhLhEdYQApuhbRnYZOBnFGDLEU8sjRYLxjowoWfGi7bfR0G3eZIDsZVF</div><div class='del'>-m1M/uUUSGlcaO9JCZFUurVDb9XR7ffWo2vem9cprlM5JHKmkeDativU84PZiFpyiorqqOCrtcqFt</div><div class='del'>-K/WAfSTwFAUb0URxQuvaakKuu3xCORBcm2DNaiFr/jOCEhKEwLWADgHvDJcGbOLgKYnDE7kRuJQ4</div><div class='del'>-+8A3ScHzGUyKEUJQnJR4NxeHs6GPIha50TR51eo4TZo7gPh06zGBwx7Sc2BQbozNGFHb3j0rOXaV</div><div class='del'>-5vTry/WmJjd1XXMwyLpuWjbxuIzHLBjpIe3GOqDiIdpNhVEP/PJmKaVAPwR6Cq69IuKS7msViI5n</div><div class='del'>-EDlLo2lib75pVgBHqbuU0zCOak6yLLvh7+dqKwVr7wWL/954uXEWiQWJAj3o/d7oHN0RUTLtB2GI</div><div class='del'>-ChDL8d1DVe3BRu1xpr6uGy2ipGO76kYO2eDB+CLTWwqVA3j5+Ls296BpGpUYs4lKo+0Tekho6K3s</div><div class='del'>-F6Dd6+t3+stf/jdKkoQulwtVVaVpPI8j1jzPKM9LmqfR+/eWyIIKM8s4DIaFYKFiHAzM5jSo07Dj</div><div class='del'>-kljji0f5rL2tNUJrHLSFdc9sV0q7HfnZywNrAG0SDD9ADS44tBgAACAASURBVEdFCaotDjN7efG4</div><div class='del'>-fDe+EL4f4GOVYcNt/Ti00DOizbOUZllbGP2hxYGBjPVphEdDVZUUJzUliQ+KxnmW0rLkSnPFh0BE</div><div class='del'>-NXL4lA4pHxzKOB6phGoPxZxvP4657wdx79lMFHLisZvWlRRjOB6PWkUEQUA/3t6V+LEZthb3nO7W</div><div class='del'>-zNKE4iSmuWkUZXeuRUwSYjNSuM3OejtAYmsXEwxPApEUAzHGyBG3P8tjjxRGzshjk81sc/+s95tN</div><div class='del'>-G3bx0YExFY30lsahwWlDMjcPI7rdV73FASihVePQTP5O4NEjpBR02CRJNJ/Bthd/+9t/0NPTmY7H</div><div class='del'>-I6VprpLmw+Gg4JETuzjef9t2+p6LoqRKAkbsP9j8uRwAkHJjMsMhGxktbWc8GGcVnvH8mpF2TKDc</div><div class='del'>-JGVUdio89ebZ+R0mMYNxGP3ypdR9unRsiIkLVyXPCIQlyplMcnzffzBMg2DxDiisdeskhX8PKvlj</div><div class='del'>-e9i2DZUyvoP6UpWrxn0LICY0HVEU0fV6pWEY6Xw+C67wrnR8BPUE//Zv/23nUUzPMVJZqtrxvh9U</div><div class='del'>-LAEtNXpUNjishCjBaLstw4PA6ead86wtoSLV+9tZeNf1Okvn2zSSyoF7GKgN4Q4Dog4YfTzHDTRX</div><div class='del'>-blU7Lf6zNmiCgZJUrMNuhJzEKAyoaTvxpou1BOUDZ/N6TjX4SFOaZMOnwoBzn5E/bxQhv07syGT2</div><div class='del'>-z71zTmVZsNAj5ANn3zZKs5wul4vmNUCzzmVm7GkQVskRYDux3pTHzmeOM/k2Oh4OtG6rjupQ1ez7</div><div class='del'>-Tt+/fafnl2d6enqmtm01k34YXGTX7Xb7JP1FeT+Ok8S3Z1LCL14/i2fFvoR843Os+l0Ulq7CcWrJ</div><div class='del'>-jaqylEO8Nx6QbmL08X6hOOH2om1bqusDlUVOmRCaLIBrDw5L0OJLzmER8BLAGuKIt1meN6qwx4M9</div><div class='del'>-kGlEqLyBVC4gHMD8sxdtSZCcXBYlTfOkVl8Ig8W6t/6cFh8C5wVMUvg8gBAGxi32tAK6f/zxtx2n</div><div class='del'>-TmYcdFFSdl1P//Ivf6FpHMV4YfS0xXnOL7ksOR8dckv0RE3T0NPTk3qtgc47TrM6+jw65B4PBwqj</div><div class='del'>-mG63K91udzqdjtLvH2ieR5UR294Lm82GlURRSF+/fqPz+axWTdZIcxiYx82kHDa1RGpREHCgxf1+</div><div class='del'>-p6ens45GYZFuLZ2AYwxi3f329kHPz0+U5zldrzc6Hg8eeGT9BjjWuZcwU+avY9QGujFixvDnrTJu</div><div class='del'>-nieqq0qz7h/xhcvlQs/Pz0JeWqjrWsoytiNDkCfaorvwGLZto+fnZ4qiiv7jP/6NzuczlQWPN+/3</div><div class='del'>-m3dgO8do/vlod+AK/e37Kz09PX3itKNHh/szSmt85kK087fbnc7nM+37TufTkdZ1Ewnupq2k1Wlw</div><div class='del'>-5t+B/vrXf6fT6UQBEb28MO/e9uuPiUOggWNtwevvcrnwzzGWeUnC8vbZMg8fxFTwH2zbjsoyV84H</div><div class='del'>-ql9MGUD3LYqCDgcevf71r/8vVVVJp9OZrtcbvbzw+4P2xFYpbduoYvLj40OEQrnuqff3D/o//+v/</div><div class='del'>-oepYVDRpmnJbWhQ5xVFsnGzdogCFchgGen//UHYcCCBZmggxo1PjSgsO8WkYarbZvhONs4uGQh8z</div><div class='del'>-L/7Du95uOtrCIs8yNhvJs1T7b9zO6IWxmKDkA0vOllzwh3PjLtePFbKhh36g0/lEeZZR2zQs+zU9</div><div class='del'>-L9BeZK0jgy2XEvx8PrHaK03F8stlzC/LzJFMJrmX3YtiiuKEZnH8wecbx8m41TJOsxnSB9oNou0T</div><div class='del'>-X9+OjhzCLoESEoQJsorlwIPGncSjYhBd3+vh+jiVAOFkUADLn9/bRYv/RqYeI/a9xmEVRak26ojn</div><div class='del'>-htYCASjWBt4CxhCtBUFIX758kcM9UH28NfS0ZCRIkYEtOD0+9+Bu08aa2hRFITXtSGWRU57l1EjL</div><div class='del'>-gmeYpgkVRU7bumkSVBg6NijnUUZ6kRQyDr3fb+LzV0jLuamfpj2YbCAosKi6rihNM3p7e9Pnge+W</div><div class='del'>-55l6X0LDEUUhxRwbPXyyPbJpqvO8SBwUu8pCibbtO41D79kcY0MhIGTfN817v16vciq2Gr6ASuNR</div><div class='del'>-bAMgbhxHprXK7XdvWrMBgcKG3gjOBoPgZwJlR6w0QDLm7rMTLysde0ozTktOs4wm+W6QmQLVj6JQ</div><div class='del'>-Z9D22SHngIHTzJOYgr8Nj3ubhMQ92vZJRcYONJyInOeZx09w72qh2+2VAdMs101s2W2WiIMAyWEc</div><div class='del'>-xSU59lxi8OwHY2NmPRAtecd+D3gJ4KYbH9Shj8KzcXJJQwDZ7LqDmAgtShiG9Pb2ptqSSfr5oshp</div><div class='del'>-F508/8xRE6+n6UbbFnt8fgvAPY5nUb0MGo0207alypC9XK5a6gNcddZxkQayZFnO1d0wUBRHNE5E</div><div class='del'>-Ybjqd4BzLyrSYRxpE83F8Xiksigoywv6449venldLh8COLp0KYD3KsxLYvr555+ZqVsUFAgIOE+T</div><div class='del'>-5FaEVBY5tzZRzGpAO3d/fCAAxuyCA8NsmmZaHh4sIqxb435igbOicF8a82O7+R2hg1QJCOApinix</div><div class='del'>-PfL6LUKLUd3tdpODIlbAMo4T+n555flzWdI///lVQcDz05kWyeura/Ym3LbdmKVmHiXWmjRgJDOo</div><div class='del'>-IIkty7ftTtfrVQ+7oijper0KXTilvr95kmsGeVaPmxBFPK758vJCYRTS5XLVgA3ekKCz5hqEwoxI</div><div class='del'>-8PEXwVZaNVWxmXib2ZQYB3M71+t78bEdFxwShYEnFsPvv1yu1DYtVaIpsBsNPwMx59ZaHsExcRTT</div><div class='del'>-7X6jy3URQ43FM2hBiq5zXprFVyBjc8yPD5mLMw/l559/ojiOhUcQ6SHeto3yQexYNIkj2uTz4LBB</div><div class='del'>-hB2qDtjA2XxJZC1gcjQMA/V9T09PZ+8ZpGnKY7n6wK4/faffEVXGMI7UCfgKWrV6WAjBSG3ml5W2</div><div class='del'>-bfY0GjDo2fadZjNexOUexyxTj29ioIE5uS0heZHsugCmadcXFlDgzUF//PihC71tG0aBq5IWYT+h</div><div class='del'>-auCHV9I8j5Smmc5FIZ9EP4MNjnBQlInbtlHfd56Xu1WKJXFMd4kXY4vqiIjcDBsjkHmeaZy4uvjy</div><div class='del'>-5QulSaq5bGEY0sfloj6GznHGjXdUqy4JwRYstXpr5laUFMc8U8YGLWRGbduTefGDPcCpOJ/Ya3Db</div><div class='del'>-dhWgpEmqL3XfiV5ff1BdlzqHfwx2KYrSMArdGOt+7xWo7dqODseDgF7ynaWFsso5R7vdTAUzeIYf</div><div class='del'>-h+OBnp/OdLnevb9jPQDAaGPJ9WQ4EKswL1MtY3HA1HXF9O60oHH8pocHVzF8w23bSufTUcEuXE6M</div><div class='del'>-/Keqf+ASPPFyAOAkHMcOsASbsB8GHXdySzp4HBI8bxzOWcZkp6qqaRg65ZCg/YmihNr2qsw9x+u3</div><div class='del'>-sWC7trS4eJMko8vlu5cibR2rMcK93b7xaHddvHezritt4k8ZQwmWZ6kktzrnUYQbWmtrJNNaRxrX</div><div class='del'>-x7IKbdtWqquKivJIbdOpwi5JEvrjj6/Kzw+C1ltcLLhJlavNwNlC80MIhHP6ib2ydBf+Nh5MEsfU</div><div class='del'>-zA2VknGAW4ZpooW+rDw/0b7PFMU8QnTKw53SJFEGYZqmNEspDXkwV0Shjk6x2dBy5HmmVtR3ibTm</div><div class='del'>-1KHC87B/XEg2F6BpW+rkhTn14qyHD8u02bI7jEIPII2imD4+PqiuueqJo1h56VikGJOdn87c0xYl</div><div class='del'>-HY+zKA8nnj3L7YvPaA1SWWCVKlsOlV6cFER01/bndrvrGAqbGov/sVXAtCUKI2Xc4XexOUmjbrc7</div><div class='del'>-cdoN7M/r+kBFeXSyceFCoNcOArA4RVabpEr1jeOIdtr1MOr6gacI66AVkq854GeH9wOfCvhY8ufe</div><div class='del'>-6H5vjBFpwBJrmbDMM6+vv/3tP+h8PtHpdDLeAhH7PAgjF+NrjE5tWrFNh8LIdZkX/X4WZ1PujuNN</div><div class='del'>-F5rdjpMaaDoQdDU9lLmxTWc5Hk8irinEjiqhdR2p7Vqd65dFLgakH1RVtRed7ND7WHrvRRhdo04W</div><div class='del'>-7LgGbYINoYTwBe7BLN4ZKcszPcHRO217R2XBh8A8NXIDLR7bMU1i6kXAhN/P4E2oJeD5fNToaxxC</div><div class='del'>-EBwVeU5d19HH5aK3jXW4scEh6DGXZSVUZSj/VgGSQIgZNBAz1ISl0/lE5xN71wdBZzznF6nMMnW/</div><div class='del'>-xUaxSbVJzDcjTxc6BYDHoaM8izyPP4xdy7L0xlGsbst13HS/36lpWpkC8YIE2OryGmcdK+OdQZAU</div><div class='del'>-xxGNJkqMmXS78ueLgidP6InRe/N7ejehNqHn0TAMo0e4+bhcVB8BUZXDbpiC7Pz/mYoLfkYcx7TK</div><div class='del'>-n8WGhFw7TTOa55aGYaC2aelwPFCSxNKiTR6IGYYhvbw80fF4ouPxQB8fF70AWeuyfMqBDEWF+Aiw</div><div class='del'>-Wl0EuB/zPCnhD4D/tm0sB56XVeOzrYXUvDh/fZhbIu5o38lbEIgXg/mlzYDjh5FSIAkqT0/PdDw+</div><div class='del'>-0Tz1CgTt+y4WX6v8jkB6+ljLa+s6y+Vro23FrkGPpFwAa+v0iG9wRmGj828LYKkl2cZJM8fTSQ1S</div><div class='del'>-lI8tgOC6rhQLoGWzCpHvB7IIxqVR6DICMVK83e50PB4oSWqVOvNCy7SFKPJckXhlm0XOxjrGRGK9</div><div class='del'>-6vtANNb5fGYcJcko7Hu63+/eoYZEHWu5lefM3Bynkaa58IxIeWSaqUEqLM/++fvvdDqf9Ta21RoO</div><div class='del'>-rbLIKRG2JsDU9/cPxW8slsROyy2tG2TIuZdXqMlG2+7x8fOMWXnrtguj80R1lepNahOuUXh0XWsc</div><div class='del'>-rlLdIK+vb/Tzzy+UJAcVS0VhpBZpvinqJozAxatW0ySlsuKWGF4YaCXg3RjHkW7+JDlQHDee8xbz</div><div class='del'>-SBINVmEAPdQcT8vGtYcBxp/c+uxaRbA+YmIMAHNObASAQ0kceUGOaZJSHw5KNbTRUChHrTedRVuR</div><div class='del'>-L4DRW9/dKM0KmudWudbQds9yM12vV8eii2Lqupvq662oxpbsMJnI84ySBxoqbug0Tb1NYA8R++dx</div><div class='del'>-6loKKDZgmjFn/eNyUYMJ8NY5bTeVm4epzLHwyjEuto48dV3qpoGdV1nkukE53ZbHjKoajGBiMnoO</div><div class='del'>-StfrldZ1U7oryExdP9DatJ5BJWsqbJjLqhOBgHw/OuugpJJf0LPlcDg/PdHpeFCm4ONtFIYhzctK</div><div class='del'>-0/2us3s++DNxiSpp31jdZpF/UHHtAWUTeYOAqJTw1ziOaFlXRebzvJBoNHdIW+MQKAKR28eKQBf1</div><div class='del'>-VhQZnU5nwbMW6oeBBlHvYSTq2Y7LwYZSe9tWakSxaY1RkyThRJ9I2iqZnDRNS0HQ6UWAvwMeAV8o</div><div class='del'>-u4d9Oa3E7rXEeGZ4jrzPEs8aLj4ej1SVzD4CIIX+LpHeAYfAKDPIKAwozjOaJidw+PXX3+n5+Uwv</div><div class='del'>-Ly8qUcUH1MguKdG3MFQbcABzQMnHoVf7IhVghIEEdHJJBk9BHWtlqb7wr1+/0eFQKzX1cdyD74je</div><div class='del'>-N8v4MHDCCWaSWVooNhhwh3meqW0bA9iwdHYYRn1JccyHVtM0VIkbL8pb9Go4gPI8p6qqiCikJBl0</div><div class='del'>-AQ3mluHFOmnpZ6O5bVmIMSBKcSTwEDlyEErXPC9pXRsRwCyetwA2AH6HndSoW42M7bDY4G0fBBEN</div><div class='del'>-w7sGftj0Ziy+6+VKlQiswLbbt4X++PqNHW+NYSpuSCT48PoYVBeBagr05rbtdA0hUi2RQBh3qK9a</div><div class='del'>-zSUJz+yLolSNCw61w+Hg3JSHxhzwifd9HoNWHL8k8BKH4XgEjwYrQkOli4sA2JmlXMP/IkkSGnQM</div><div class='del'>-uxhNyfogjuLL+fX1h2phbEx6DDcXlN9M6kiVNGNBAywE+L4BuY7jiM6nIz0/c2kPzKAscs+aKQwj</div><div class='del'>-ipOYprmlv//9V6qrio6ng2xm3kzzsupMvxQueWjklUmSSO9JanYwTpv2gXCySdNEXYh8S7OQbjcm</div><div class='del'>-YRRFLj4BbtTJ1NGC7ve7N7rC34WFVlWVKkyal5XCcfwUCNp1HU3jLL1XrgYh07TrDYcTHONB25uy</div><div class='del'>-jmD95A4LZ1eblWil0GnK5pOL6BAu15vOna1as+87xSzQtuCgQmlpfQRtS9U0dy+zD8+5aRp1rgUK</div><div class='del'>-DgNUa2SSZqk6Mn1/fVUAFcaxaJXYIHWjvp89z4Msy2kcB280iU3DrarLIJiXhQZ5PxZ0Bv6EZz5P</div><div class='del'>-k1rdp6lTD0ItiQvg9fWV6rqiJMmNtVnySfbN686xJVFl2cpOcw4WRzfHpZtLOE+R54IjcTW0GPUi</div><div class='del'>-BHxcPTREtKsnACq7OGbuyZP4Co5DT4us0xg3O3zUVHUlriZJ4ju5Wulk0zRCbsno/HSmuj6oh1+W</div><div class='del'>-JpTlBRF9qCNK1/cUDOxDV5YljdNIcfxMXdfRumZaksFdh3UAPd2bRi2WMIpj0kOqnvhN2yqXnzX8</div><div class='del'>-pYwKmeWIWC6X/BvSPC/ag3FPXyoHHTNiaxoJUVQQBDSNIxOhZGGhpGWzilH7ycOxFjVWLVRdF1SJ</div><div class='del'>-hCE7R7cR64+cdZsKxMBg9GlMhr66bVu63a40TSOVZa6It3XogUMRRnjwebSVBMaJ1rwUHHlbEVjf</div><div class='del'>-PMzq8yylRXrxJI5p3x1xiqPkMsryQsdiO0kWgAhVfry90TRN9PHxIUS0XL0cMc6FpBseCfBiVFGW</div><div class='del'>-CUeBwhN4jy/IIbo3jZi1xMZKfqCyLHSsu22biqLmZZXnW2r75RKlXAXjqNPkYRcWi7AsRPzvuK2R</div><div class='del'>-G2jJb05n4zwtEOGHjAJoa8Iw0EsTkw0FW/HBnN2xYzhBkgm2luWY49RLEnYk5ZK70eivTZR9TdOq</div><div class='del'>-AgzlTJqm9NNPTCs+HL7Q8djwBg0Dz/1l0T6O1UuwpgrDSAMlEQGNh4YSt2laNpvoeq+KgXCGbc1K</div><div class='del'>-vXnGaVbXFEQ/8YEzeQ49TMZIKY6YReiiythqvOtaHddFYSA360bT2Ht6ACC0sIECD+NR1w6zj8Vw</div><div class='del'>-BELPiSn6VAZmqZM7c3lb6nO8XK46YrN5eNxycR/ciyNTmqbq3gTcx2EiqxfmAg/FZZnp9fUH5XlO</div><div class='del'>-379/pzhOaF4+h7hAwbZvjToqo+K4G4INiFnMSGR9RpIkmr+w76T2bbCuS1NHF0+S2Ku2sEFh5mL5</div><div class='del'>-I70AbUybhvAplcQfPhDwXMIwoqoqHKlrcI6+IBlxhPriJUM/KgLt2sI7dSYljKVxliDvi8C4HuH9</div><div class='del'>-QxPBNnclxUlGsRCtAKKDIDdNF70I13VlSzBrKAjJJcQmcI7N80wYYqP235jZJ0lCX799174CD2wY</div><div class='del'>-7jQMvVoyQz9twyX7/kOz5rO0oCiaPzm2JJKOCmsquxl6IQghJISlyZmQPtjaClZPrqzetLREKo87</div><div class='del'>-dRNvo2UyHrKl3TTN1Eyt01RLfkF7u3GSb1FQUeRs13Rv9PklMSlmgp8HEw2EQljOOnzpoQVAmbmu</div><div class='del'>-q6bybNtGt9tVuAcp9X0nJp+uf87SVDMQnBOvT4/FXBnWaVpJdK3yKGz+H8IxLQcfbeH5fPLCZp6f</div><div class='del'>-n9XCCwYyWMDItAfmwdmUkTEPDelQ17QTj9XWdWMNg5T8qDhiLxnHaejhXCVwkq4nO0IGfwQmIEkc</div><div class='del'>-Udv19P7+zuK3B+UdEdHtftPDBlZb8MeoyoI2MWHp+14NRrDpHyu6x39vJzM43BF7DkKXvSjwfeM4</div><div class='del'>-Vum8f1E4Q5JNKNaoImIIC97f3ukgqrVF0FYcDkDveVOP+pDGadMse3DB67qmKAwUrT8cDlq+8d9N</div><div class='del'>-9DScF6J1nXRWafPP0A6gh7NqKzffjZSiG4UBrWb8Mc+LlPiT58Xm8tdinXZAa76uHPEFVxpYSyWy</div><div class='del'>-enBQIvONKFKRD8p+pY1uG/XDQOfzmTMH8hO17bsCVuDbY56+zIuna3c+jJvnn7Cuq5qrghtQ1weP</div><div class='del'>-qg2hET5vI4QTmzEPpx9kOtiWo+97nSLYVGxLIWYLNufahCTdIAjpdDpRnpcym2+oLJ9pGP7wSlmb</div><div class='del'>-sPRoFxbKuBhMOFQq8C9s2laVi5Y9xzLlK5VlpQcI3j2byKTqUYkLBa0gJiD7vtP1dtd3CSrz99dX</div><div class='del'>-rWIwckZBAzCb13foCdng7WCtxXChqIGOfAZ4DYIubPMKwLko8lxDb1j9l6mzUSLCIlxq1i4cno4M</div><div class='del'>-fjrBWfA//+f/s0N7fDqdtaRwHzLxONr35q7jPqa8ZoqEHuoDZXlJb2+vWqpD2x5HkbzISAkTzu4o</div><div class='del'>-0NMJixwPmeWXiSLa7IAaeJpojAn7oVeNNrLTUe46SnCgZT40+k7EtGqPyLr92XM9ciqyUOXHiTix</div><div class='del'>-4KQF43CWMnnfdyqLkuIkptvtRsMwip99objL8VAroIp3gXEsq8FWSpKYirygfuBgU4y39m1lAVOa</div><div class='del'>-6jOG0eY0zd7nw7vkDL1GFrhL0B3k+fGtnipCD6OJvu+1+rIWZtDptyI3xWhu34nBUjG8gDMyyCto</div><div class='del'>-X5xuI1JPB8dY3L2UHoCfWBOYzUOVCZ57XZU0i/oRnwXZCGzGOnlyZtva4sDNBAMjCunbt2+MBYh/</div><div class='del'>-IrQlaZro4d91HZUlqxnZrPOuVQ94/LYlcIYnC7Vtp/sJa8ONZ5HiHInZyEqTcDy2baPz6aQ8DgC5</div><div class='del'>-8ITAhV1X/I6m2VUVcRxT8Ntv/74jHYets0L6+PjQ3rC53+nl5UXTYRySftNy34JVkP6iJ/727Ru9</div><div class='del'>-vLx8isTWubA6EHHPBbACt823b9/py5cXT4hjI8vQH1tVHhBUIqLX11f66aefPN5C17UaKIGSG/23</div><div class='del'>-zl1FKdg0DbMTjTWYLdUsCw6gntWZv76+KnsS2gKIZrC5eBy3UtPcpaS/aU7h6+sPOp/P+mwhRLJj</div><div class='del'>-MXtzPvItmvudyqrSdgr9ohW+MJjluPjMemPA9f3tnZ6ezmqwacFGLHr0vU5xGKqt+cfHhb58eaZh</div><div class='del'>-GCnPMwoltgoa/CRJnONTlmpcGn7e5XLR7w8dhR1z7kJks34CeZZSLqYgX79+o5NMmvB+LdBqzWJx</div><div class='del'>-mTVNwwaaRU7/+Mfvyp47HA5ijXZVQRAmYsiPgDcDaMBd21JRlp78/M+8EfB+IM8Hn+B2Y3mwrR7s</div><div class='del'>-gaVmLX2nWRR930sAT0Ft29H5zN8FY3FU/dfrlWI2ImBziHVZqB86RZb3fafL9UqJIP0ujSeh8/ns</div><div class='del'>-5qsmqhuo+ob8NBO8aDnqlt5rxyjWk856srmgicBzVekECIJHgUZzp5xR5zL5Vh2VQfsAk8xHOS9b</div><div class='del'>-eTFrjTMREw3OnGaWBgNYsfLYcdw/ZcjxSy3U/ALe7lEU6Tx/HC/6GYDmpmlC+4PhpWWfocUB6Kl2</div><div class='del'>-VIYsNAwLNW1HhZCM+CbcDLYSCe26dWQv4cYjzXleFqVl2zRh3KhbntM4jlTXtWIMuHXatpEIuU05</div><div class='del'>-/2jlkiTRZCPLKmy77k/dkAEawrcRt5/dFPjPME5qOIMx2CMGZHEWFVhJpQMrOGxu7qnZoWkSMxjE</div><div class='del'>-2KElZD7EJpuw1/U7LysVOkrld/JnbSzG5hwtvtE+DJRK1biuC0e1Gb4LJhJoGdhladFWPI5jyU5w</div><div class='del'>-JL45ddOF243HzjFnrLFPu5XvwqWG+2GXzw76K8qNfSdlWLkQRVJOteXvo7xn1iB581Cc/iix7KHx</div><div class='del'>-aKYI92G475xORzVQsAQWe1MBgYYTCrAL5xIbKa9eXV+xSQzYOc3OcYgNK0BySbWlwVwcn5Utn1PN</div><div class='del'>-UUB5DtcYTky+a5XB8dwt4d20bavjJpsN/2gVjsUExVgr6DFuxlmsoLGJQcays/44ioUUFunzwkaD</div><div class='del'>-ExK+XxTG5jm5Vsqaa0LPgCgrYAZgpimBRWLXbQ4CDsVHIZhda0ppNTN9RIxbXwW7luBGhH7e2biR</div><div class='del'>-FxiayXrAcwgEh8DPseM8HCSxtLJoVbitXBU8tu7LFmyGccc8t17aELdRNR3qihoxi/GDQF0ep90r</div><div class='del'>-PO0qqe9Hj6wFVeE9CCnPE4q3ddNbySKw+GJFXqibCUwOcZKOQoKxL+hx1uoLGIi+fftOWZZQXR+U</div><div class='del'>-2TSOA3XdpjmDeEn4HChPsWjcKC2k47Gm56cnvsnGkaJo+VMvfXuAIJXlQ7z4MLu3VstxnFDTdhIT</div><div class='del'>-HuhtZeezbC6SqHaCN6KLLgOnAOagvhw2pKEflAyDFuVy+dADBsYWSFdmh5vF8wuw1GvQsSGiAjsP</div><div class='del'>-FYEVToUPnoaO579oOOfhcKCm6bxDFFRhpPdoXNu6iFR6U3ltnuc0jpN+FyDh1gXKXgwqioojFcDY</div><div class='del'>-1o7jsGO9ZIZhlFCORVWIoM0CfLNVhw0OQfkOh2lElDkKLzsVgaTmFICh8gyYrn7RUWvfdxRFBy+J</div><div class='del'>-ehwnquvNc1PC2gB5Ca0wJMpY98gfPNQ1xUlBYTjogeVcl1J9n5PR3swze2K0LbczsAfHJYYWOZ7m</div><div class='del'>-Sfqeu4RlZp5rTpxEgvJP3ukFD0H4qLnFHenJj5eKFzBNIxVFTnXNJ9o88wHy22+/U55n9PPPP6tZ</div><div class='del'>-hKNjhh5aisWItJOqqinNCtp3dl+xfSjz3AMPVbfThLo+6NhwWRY6HGrtk/AQUTJbrwRk753PJy3f</div><div class='del'>-bO8KgopdCPb3opw9ng6sJJRxJQNPTzqXZrv0iPKajUGPx4P4KIaf+Pk6z5bNiR7f3hbAZ3Bj/tno</div><div class='del'>-CVRX+NldLhf6y19+8aiuYRDQMM+0bZGW5DbV2ZJw1nXR8Sa/h9hzn0bVBo9Gm7dnnZTtAYTEHfSx</div><div class='del'>-4JhgI6MyYFXe5lUSqFjcDbzohYBoeBsQ49ylGZgE/dkeXkXBPgyaCRAG3mfFfmCQclJbL0u15kMh</div><div class='del'>-1LVLRHS9XPnvLAuNtw/FWyyWoOtp9h2IofVI5PlZpiK3k3yRxtZsgJHkWOmnURTROOwUJK6PVvQ1</div><div class='del'>-gcVWZII0Ji1RMWu1o5h9J938cZLR5Xqjfd/o5eWJwjCil5cXJRIFAbPzlnnx6JsIYEwSN+rouruO</div><div class='del'>-UfCy7bjS2n3f73d2lBEz0DDM2KFXyvXD4UTrMtJibiS0D5BwVhWPh07HI0tmp9njUmAkxDeS34pY</div><div class='del'>-LITn2itNo/HRT2JhUPKsue1aeilenJd7GGklYstHtUNLU8VEQPLClMRm9D0q2XC7sgox1568aVpl</div><div class='del'>-CoJcsytiH+jkw/LgsXn48AmVnoy/g4sBjEIcRHme5FpWKAAAIABJREFUi2tPbA6SwBvfxjHbXe87</div><div class='del'>-qU0diE5oQ7q+p7/+9d/p+flZrdwRQIs26/ff/6C6LlWWjv758fPjc0CLsZuqh3UsNdUVr2c3f2fq</div><div class='del'>-Oq8pUgcnduSNlcsAFaOjCkdeNmdZMTjMLseNCSQlWtdAAFzycg1A4cZn3kzlhINuFjpyHMcUwwkH</div><div class='del'>-2eWryAcd0DFTRpmHQmqCyrJ6pBYr+Hh7f/NUe5ZcMs+zJtWu60rH44ktjKKKsnTUsM5hnLS0nGeH</div><div class='del'>-9Pf9QH3v2E+h8d3Dza1l7ea7+QDXsO44KHud/ffqiTzY8XbWzVYUpXi2HWmZG413srfVtq1ezDPM</div><div class='del'>-TUE0cvHPDOaxXj+mQG61R1cfVo9FFCcFRSIi4dZiUpBr2zb1DETFxEywWIg2o/bosEKD8zCAI1QY</div><div class='del'>-19tdA2GQa4fodzjUAky0vIZ13YxpCVt64eAEDhKQ890Hgs+HV0J7XcscO1YMyU5+5plHujAd6XtS</div><div class='del'>-ang/DFSI3uGXX36m5+dnbSOwWUEXrqqS+RNC+rHEKKDkTIN3KUU4ANXKLI5oXVlluG7OZanre10v</div><div class='del'>-1kMCGxXveVtmT5X6qEgty5LaptHoPs2/EDs+EKDs38GaQcs3z7NWDexjuXpVUNwJ8BIEgRIM1Bbr</div><div class='del'>-44PatqVM7KuwgTGjtOIQoKJsybRJL5NSEs8eR31dN+qlp8cHA3V1vH9X1pW3cZbVA740/ktJQ7vn</div><div class='del'>-VOMird3IZ1kWWuWWwYwbefHWDBPtECcPR577kbVPX9aFxtsPL90XLwK3AJewzoqab5HxE4inBpvb</div><div class='del'>-Tn1717bhdrvSOM7yLt4FrOq0HE7T1MNKbFqPE6YEqjeA3h74CeKp45h9FwGyjWP7YP21iDakoG1d</div><div class='del'>-NAjD4hCwP1NvCKmKPL77ttMyjS7uTA1JVrrdOgEwM6N+XD9Roy3ZKssLFWMBzOyHgW63m9iDH+l6</div><div class='del'>-HWnfezEInZkwlKbUioFHlpXqTu1s3wdlUSaqzttUlqyYlnx/aBWsn4GNtstz9nvM0oIPB+Ph52zy</div><div class='del'>-Mj3wMAmbponePz4oSRPFNaZpdH4VIn7Cbf7Yoj9WzZjEWKBaydlW/cVkm5gqmR8fDwfq+p6maaRl</div><div class='del'>-iT7Ngq09tFVaZWlC85R4p3gQBHS9XClOHMr88fEuIEpPbdvSTz990Vz00Bwc+G/0exbdxYNgnvdg</div><div class='del'>-TB3WTwEQiN+Gnx7MSPCQ8LNRYsdRrP09NmqWptRMrRcGikPJBkfixEdSkCVO4SWBfejahI2iCIm/</div><div class='del'>-KG0d9oH05GWZ6XplC/VCqNCP1lo8D849JqG15cqyVJNmb7c7NU0jZXVBVVnSKFMVBkHvn1yLAcxa</div><div class='del'>-Gnkgt52VYIN7YcVDzm47obpO1A8CakdOm+o/4Rtw0b1LzJmND09ip/XoupYulx/05csXGsdJk4NQ</div><div class='del'>-lvf94MlzHR0+UbLT7bZ7ORR936nrUCTtD+LhwOjDJYRDsihKniDMk1bVIDM1TSOOzzlN090bT377</div><div class='del'>-9p3WdVGvCHbXTj5NWyz3AgeItZez3hF2jcZxxFqAx/GKTgDEZCGKY4mljtSY4JEEg9Nu2zb69dff</div><div class='del'>-NBij63s6CV96GEa+cRIm/Dydz14PmKYpVVVFT0/PagzBJJX5UwCD7SUBcljHWjALLUCGG0UrAqN/</div><div class='del'>-YIAGrjK5ovqsflwUnEQ5frlePBqstXbyTUgWNT7F5ofRJObInKnHXnXfv78y4SSOGOBMJ8ryQj0T</div><div class='del'>-8qI004hEZKmxuuzY94ES3WovLF7BtN9Bqo07LcvMEeJSqi/LTMM4UCySU9trWnBRc+klRBQ5i4xQ</div><div class='del'>-Rx4LEbFluM1A8Nl3FtUEAem42QrVJpOabB1vnK8go+hLltO+b5SmufbMqCbRKoXG7o7Hzr0aveL9</div><div class='del'>-RRHP/Yehp7IsTFSdc2tGPFocu2zIeXaJwLD0CgLSCDkYctjRISjKTsLLysXz+UR9P1BVHajvGomp</div><div class='del'>-I60QIU+OY35/j4ehtXHDgWGxmnXdKIYDzSNXGXZJ0zTR169/KNca5iH4Qkyumbz59PPzE/3ll18o</div><div class='del'>-lkBJgEFcWbB/YJomYhrZU11VtG6rxiJHUUKbnjG798DwxZWp9v5OWZZ7Xv8IIEUFY28oy8SyCkfb</div><div class='del'>-xqA8xedumkb75G1zSbXWqgyKQCDJVhuulYD0lujpmAHGC3OeZ8qzVIVEccwg5+XSUxS9O9uzeaY0</div><div class='del'>-ibVvZZJRSUEQeSCcxVwY/InVHRY3xroGynpECZ9nGecrzjNdb3cxP2FfRyteAT3aJunaQBJsFLw7</div><div class='del'>-y0/AAVCWld6e93vjuRW7g3qmOD44LCR2IKh1FsbmBVkGhxuSd6yNGkCwUWzcsXZaoVFbzAEXlJ2U</div><div class='del'>-YWKAuT7GxBhtYpSXxDGNwyAu2IuyXdFaJhITxz4WR48gtO9Ex+NRXKASBWGhU2GjmUoMTifPSWoU</div><div class='del'>-fOB2u3nYla3Omf9yZ1PQPMuoaVtdOL49OB8EmBuuwpfHTQu9gG0Ljscj+8+FmXdrnE5n5o0nCQ19</div><div class='del'>-R8vc0zBOCoRgg18ub96MGskziPAKQ9yemzcLxwLlcoo3YZok3me1SL1F0T+PD6H849FllmXiNPRQ</div><div class='del'>-AstILIp8lR8onnZkZLX3LMDZ5GDcRP3FmXNxFFMYxTR3HW3bquMfJPqgTcBn/vh4/9SWIdATbcG2</div><div class='del'>-rWwiaUpztCLT7A4NCIeGYdCRKIeEJlQWBScwZ6mHhlsFI2ba+r1Dh+kMw0jfvn3XiYANDsElgsVp</div><div class='del'>-rdHx/eHpD9DVchf00AtDKvJEfCJIDyLrZGQj8Hzk35mLvL+/0/F4VMt0TMqSJKHr7a5tI1yFbEYE</div><div class='del'>-ngmb1Ux0v9+05Lbcl3VNhPe/0jT2oiuYFMjOMg7i+e23/4+enp6UKszipVlThZqm1YCULMtp3Vqf</div><div class='del'>-F2Hi02xYTJIkFHM4Zuj1Cz6QtFGeVxrgOJkSEmXlME5eJHMYRnS9fuj4xYJJoyTdfn/9oaMtkCTw</div><div class='del'>-8lEeO7CMVL+Nw0aDJrNcEWH0PjgEioITUayLsL2VLCcct+diUGm9VTR7PaV1WajtOjWiAECJGxGo</div><div class='del'>-7N///isdjwePFYhbhohoMGUaMgZRIs7LQhachRIMGxaHLnrmdY08Q1PnhBtr1QG5LfIZLA4B1pp9</div><div class='del'>-/2VZSvZ8QOfzmcZx0OonkrK+ae56i6dJSpMw/Wx68ibP+TEdOE1irz/FRsV7xgFmDVHCIFCji8dW</div><div class='del'>-B3x+dwCyyQyqVExCuq6jSezYcRtDvNV1LftJiiCnLHKaxGRjE5ffWDAGeBmCA8OCn0RbM3uQOfwp</div><div class='del'>-VLMRNsFZ9WdleSHxaqNiNHEc0UfPictZltHpeNC2No65fbFjWGBbOOSzLCPayeQixN60LklSiqdp</div><div class='del'>-pmEbvVNSraIxKhDyBiKSWSk3qlGIdbMBDmCJQXZzYCECUc3ShJqGD4e6rqSc2fSkAmmBVU6hlvmY</div><div class='del'>-oeJnvr7+8Bbe29sbFQWbRMSGsw+9OCidjwvJKapCIXaQ/rvb7WYUYwuPqzb6k6iuic7nIz09PQvw</div><div class='del'>-FOtsnoMiSp31gsEHlt84+r0uqh4G0NzBjPEnxjrgmrvv5XvAb2rbXSjvvRVqKdo3x6EY1JqLK6ld</div><div class='del'>-Y7/TNFPCVZrys2Yl5qDrxo4h1W5rnr2KLi9KWrddfSLtpAV+AzhYITaydvH2UsEzUUNbY3y6rZtO</div><div class='del'>-FTCCnufFE0yNk09RhlrTOgS7Km4VxyO+bbFhq6oSxmZKrbhUWSNaVG2sZ3AZjSBn3e93qsrCrLtd</div><div class='del'>-cJGEfv75Jzodj5TlFV2vXO0dDgf2RFjmT9FrPPdHtTTRNE9aBaNiUkMZ9CAooXFb4L+xoewXWZZF</div><div class='del'>-F6S15oaABYsSH4bzzZlws9NOAXE5hISVouDeCP8eOmYAFXya5SpCsQIenyTkePFlyV74aAXA9gPt</div><div class='del'>-F85EdtE6xlmiJR3m3KPhgMN/3uoNsOj4c0tOQl3T9cqZiFVVq5hqXTfK5f8Pw5zGaWKHWJlwWAo1</div><div class='del'>-MyETPUQtE3CaHVUWh7Fl0E3TqIvJJS3FXo48U5HZsy8MArreOq/Cu9/vpjKIKE1iPXyBgTyO6hzn</div><div class='del'>-fjRp0aT6knXd6PX1lcZxlNSk2BPocF5hyZwUuWF7sURno9FOJwhoRwFegg+Adq7rOwqj0POZKIqC</div><div class='del'>-zucTLfOixh54Zqk4OE8zV2FQBq7rplgCeP3QczCL9KA9uJ3DW8svtHs8mRLAUVqSdduVIIRnye3Z</div><div class='del'>-TMfTSTCbWeXFibTRgRk/932noLQLy3VAb2SegwL4//2//187fP2c0QSPnUBJdL02RkyBnpTct/m2</div><div class='del'>-VOBMMyrKJ1RVMtAHAYizRYo01z7PUmq7TvXvDhCKPI09TvnHTHS2ZCpU157IKfj99btIKiMr4tWN</div><div class='del'>-ge+JF2V16Sg9p3nWEFIOLK0oSzMaJe3n0afAIuMIutyEoQiR0ThxDnyaZjQMvZSDpIflsi5a5dgo</div><div class='del'>-MEd3XT3qq0V4NY8hST6l+kAYxOSeWpJsOj0kNG4riWgaJ5nXb57uQNVu86KVoUPnQy/Hvm1but9b</div><div class='del'>-Oh4P9PL8zADdwCPfw+GgNz3Sk/Ocw2DB5kR7h3YM2AQfzuzpwK7CLu8wFCXj9XqRiUDmuQcdDgea</div><div class='del'>-xonarpUq0gppXKsFfUCeZ67yCiU9WTQPyG9klD6kIpdDPY7ofm+klXLPBM8ROMhjgjIo8PYfNqNN</div><div class='del'>-RQk56t+/Xm+6Z6EOdUrPlC6Xm4494WPhuU798cff9r7vFeVFSY3b7e3tnb58eVFgCDenl62epRRJ</div><div class='del'>-ft8jAeE///M/6V//9V+pLPJPjCvQGlG22oBGxHu/v7/T8/Oz56cH1p6jRgYPoSa8eaZppre3d47r</div><div class='del'>-Lpm+u5gYc5hzYAwDtRr+f+aa3+hwqLUi+vjgmPTnpzNFMd+QMGq0ACPUdD9+vNPpdPQio7IspYAC</div><div class='del'>-ZYyxWxK7Ij2dOUgyzTh56OPjg56enlxak7EU8/3nN514uJYhoKZp6Hg86uJlK7FUf15dV7Stm/bW</div><div class='del'>-SCjC3PlyudLpdPSixi2aDHaaJQXhImFA90JlyWarX16eKQhj2tZFhDYuJ7LvB5mfR0rtBRD5yy8/</div><div class='del'>-iWx6YM69HNp5zrZruBTazlUJaNW+f3+lX375mer6QG3beMQ1cPJt2q6Vd3Pm5Rudzyet8FDN8HdM</div><div class='del'>-lftQlDWNQ0/DOHqt2MfHB728vKgxrdKtRWWJ0a19n5Y+3zQNPT8/e5JvFaxFMV1vNw0ZGcdJsBW3</div><div class='del'>-zv/5zz/oy5cvlGepRz1WjgsUY2VR0JZlNIoQByMOBF7aiCVrEQ1+vUVw7S21LFzWbjLuscm+ViyE</div><div class='del'>-UYxFXG1U2cOH/rQgLcEE5TJO8zznEjegXcCXTUt7/r/Jo1FaBiAcXFR3LcYe67rRvbk82DuzTRhK</div><div class='del'>-xGWZ9cQfhlHos5s3ZcmyjArJrONo8oKGodNbLnhgRgLNtac4Ji0XsY6G4+4kijocnKDM2jTltu1E</div><div class='del'>-LxFotYHsenYXbqgs809ho/jzwQMN24FuiZqXgAYcxQlNknoLrsEwdMr+LApWnuZFqZoAtCt8MaQa</div><div class='del'>-WDMvKzVN60V1A8G30xz2N4hFPTiYFKlF7bPASHyU6QK5B/IOqy1E31n/zHm56ibd90h8M1JvkoFn</div><div class='del'>-EQQkzk6TN5GCLB0THwCFePeIq5vmRdykRgVUeTTYfnKYRvWOww1eGtpC4yaG0Qd6NvxCBEuM66p9</div><div class='del'>-Beya3Dgp+kSFBXHmeDzQ0/lMWV5R216NGm76pBVAKAM+MIwvYCphR4WIV+Y/M5qgjJne3j7oeKyl</div><div class='del'>-vdiMNoA599b9B301Tk2EVIyjawUs6YRvjNQD43AAJQkrsEJjp6YKMSlzcVBaIAsmGBgHPXoiwFIL</div><div class='del'>-VFmrR7dRYgD4MFPGxse7uTetSZpx0uu26z/lEazrSKfTyfPpx5z7UacPIdjHx1VSjio1oYxjxobg</div><div class='del'>-Es0VT8ZxdPOgFSF8AOdlpbVtVbizCBEMG2pdN4rTlLZtVg6CpcOCFGQPqnXj5wf+BTZZkecUJymt</div><div class='del'>-W+cRzOwIEoc38JpJuAMYsa7GoQdTDEs62o11fFEUsglJKyfbtqmfQ8ouSQC1szRx41LjlqT4jxig</div><div class='del'>-2CmIdcy2l5od2a/rygcAUysnyRBzUl7cxriJQZ3th+HTLwIRAQcAa/x7Hb9sm/MwA7j2mMWHFwi2</div><div class='del'>-mA02iGPyRDT8Yjo2sJhmb+pwONRiDBkrCQibNQoDb7GHYahGJEuPvL7J9NGbHlJxHGlvqdFK4vLi</div><div class='del'>-WIBEs1G74VDl3mtjuXWc0eXCsWds8uFm6NO8PBBCdu1BYUkOJPoxXtyVs5xGa//hwwCgLnm8cwv6</div><div class='del'>-hmFI5/MT7ftOpxOHvODAwy2CcSYf8EdF3w+HWiTLfIDNhjk3G/JOGAS0mwMYhyNuYi7jcwHEVp0C</div><div class='del'>-QWsAuywl3Ch127V1wAiALfB3nlW6y3ySkC6XD/1ctj2wuArezyLVICoHiOYspoWRo5vQOOdohNde</div><div class='del'>-LleliuNZotJOJU8DRjHLPFOaZcKOjPTn2kwOy8lomrva3cEty7YW1jBU1LyhxxEOw5A3SRjLzDHy</div><div class='del'>-yr3HwM3g4QQEis9OOIVQFHmEhlPcZ/aFylpipmFBaZZpeIFNsmEUM/xki2U/D6LGDoeaoiijj4+L</div><div class='del'>-Y/7JYWbHkhjtsPXS6rEhUfaD2+2Hi646irMpLOj9oKt3N07lsheiWNKYMqqrSu2f8Vwu15seki63</div><div class='del'>-nunDURjRsIw6J4fEMwwj+vH2RvOcUGKIMhYw1YgtMcpoJSkY38WCoOzKu1FAgWfTBc/7ICCJzapo</div><div class='del'>-l9aKe9GSoiihvev1GfB7mhRQtvwD67VowUu47bZtq1RcKDoxkXFe/7wxAo/KGykJCQy6snTeejb3</div><div class='del'>-Am1PkrAU2h6GtvVkMtokB4+jZCMwFZgAi+JSkQ874HWaZnUjqqvSi86zUl2oSNXXsWl19AyuDW5z</div><div class='del'>-jBHxObBfsVcgHtI2WcaLSoO3gQT4g4u5OdqupSgO9SS3fHyrSbckA/Th/MUyeWB+RBI2rhNMFLoQ</div><div class='del'>-GgmGsGNHqLRQWuFFwL/QHkz4GVE06Je1L9UCWYgKQ3TZYwaAPT0hRrFzV5TPMKnAYdm2rUhsEynj</div><div class='del'>-WE03jT1FUUhlWWl6Erceq2klEuVIgNCDg+p+f9cACqU+j5Mi5G7CMH8ShsBqDJsHXnjWxRcUVVSE</div><div class='del'>-wzhQWZXqNsT8jUQPa/T1ThTVmXe7PojFEkoSH+yFohFrCOaarHzklge5CfM8K9KPgwuiIttKqGuV</div><div class='del'>-VEp5nrG9GvEtjgsHMXMw1kTOJMbMlsDkvAEirZijKBKswll/b9tGl8tFCU+P9mGq3JSfdbvfnPN2</div><div class='del'>-GNK2zd6lNw4DRVXlqS/DMBLBVq4/Gwd4URSUJjGlGac7l2VJVVlyRPiy0v3eaKXCjkCmv7JlsS9V</div><div class='del'>-jR587gI1H8AXt4GINjIcI7osTU16rqOxWsUYEnfQiozj6Pno44R1lmGp0iutqSZ6X1+L75tIQr0F</div><div class='del'>-bAF6fFhW4zs1TUtVValT0jT1XpWAzwOhBlSMEO9E8mdZBrp4Jfe8rNT+ePV84C3HnUtiUvsxHKr2</div><div class='del'>-s1umHTTqaVbo7WRRbfvuEhH4QMQyjBPlWUo/3t6V9g38AswzO3VIhdx0uVxUyAV3H7QbkBxjc6K1</div><div class='del'>-hCsyxo3WQQitI1cTPB3Z9p2mcVRRlZUJjybzDxJauPgg1i7Lck07hrEHwOGqqllEtCxUFLmuZ6s8</div><div class='del'>-tAnJ4JQkhrWaJKm2rUxiEhJREnsgsc3J3LeNhmmm+70RR+5CVYfQL+z7rrZrLs5898h30DvYKorl</div><div class='del'>-0Y1iWF3ff6reoSqNcaL41lLuhrbyYJvdbjMDbNADNkae59R1XMp8/fZd6a5WFWdJNOiNgCADIR/H</div><div class='del'>-UUcYjxyCJIn5wNhGT+Ti+OXzJzkwHhw00fxzUhWqcH7fogYXoBVDaz4Mg2coYinDQOnBmNu2jSO6</div><div class='del'>-zGFoDyYbNmpvbStSwYv9/Z//pDzPvPSaaV29mTzK5tEzrlzVbINzFxJnbyXGqOC2z3Ou/TxorfDV</div><div class='del'>-t2zDfd/VxNOCWIxNrEoMs+QX50rsDGeRS3m9XulwOLAhzbrS8ZioXfrteuVJRZJ4GYz2AIbP4KZu</div><div class='del'>-R5FMijbzXCbFgXBQ26mGDQiBM1YYuBg33pSjtiIIq8HFkWaZmrHgEkBV6arYjYIg0haEx7C1BOoc</div><div class='del'>-tPS3lQJo8PbWBpV5HLmaQhIXPpO1Gm9bTqfG1AOfK80KxjBs78/o96Qnny2B7MjHGiNi7vjx8aGl</div><div class='del'>-qUMgEwGTjnqqslmkWGGZhYpeDKMOq6xKM8e5tlHMEAj5VMj1kzsRPgs+K/fmkffzLperByjB622a</div><div class='del'>-ZrVkQmIORmxOMeZAOYyM0oRjmvp+oPPpSOu2i2nm7lVaeZ6Jz3+iyD8+R5omYnTKJV9V1RrBNRt/</div><div class='del'>-Ai/vXaYSkM+inYAXv0PtrUou9CTDKNfv90Y8IJzO3CoYbavnnItS40rsoraZtHKVg9G9I4C07Dkw</div><div class='del'>-6eHGE5SRun6gU5oog46fG6+r9/d3LYXnhSnVAPp43EyeWeqj8y8R0TT2wgyFAUgsbYIzGdGqJ810</div><div class='del'>-CrQKvoPN3PWDYhr8/Ec9NJYlV5s7tG33pqWmaaiua3kfo4av4LJk8U+mzw/jWwugq6/gungzfrSN</div><div class='del'>-VVWpaAhhsNw2MZAa+x9680I+HHuIVKjCxgrOAut6u0uZlUkr4ayckiQh2olOpyda5pHiJKGua5lq</div><div class='del'>-aR4uNhFOct6ks5B+errfG7k5+dCAUAXjSJyIlsRke3mYJdh+/fEws2g6ytUoDKiNhbgiijSAN9wn</div><div class='del'>-r0Ztt3mGpRBtZFlGeVHSm/js2w2r3gMJP/eyyLXMZSCWNQ/cy1VU15WGV8KVxzrI4HZzB0KoPARr</div><div class='del'>-mAn3WTXxiDL1ll+WWRc0m7CGHtDLWMSmZb+d3uCSAIEIC9Zt9kli2Uvqulbp0Tic06yg2+3KNOXr</div><div class='del'>-zZiZ5qr/QJWFLD6MgsdxkF6+9sI6VPQiz8aCooinsy3IMI5eSKtVTkZRRIVJXbIXD7/rXKcsuByt</div><div class='del'>-sSnCOjdZX5wazQG1sIFn1eRgJMqj5jVkaUqt8l9CDRBBK/DYSmqisJDQoAkAEHy/37kFeEytfQTA</div><div class='del'>-YBm+rolurvv9rtbKmKuO4ygpN45x9fXbH7Sss4wrWG+P8k8VWaEjs6zbTm3X6Ak9ygvB/88hoMxZ</div><div class='del'>-uDeN3ngQF2ER2lmpi1mKvAhmKyayNmLjuAvowzfIP//4g3vSLKUgjGleBg+QtNVGFIXi7y5gTky0</div><div class='del'>-iQsuzEzx56E/j2M+yNDqoJS/Ny2N40hHyWxs205vM1sm8uGUeWUyqinITRUdDwOP+w7J7jQvagln</div><div class='del'>-gWGuPDi7EJRi+AZwLkSiP/ftetFN4HrV2ESPsxnr4XCQg8JZVa/bLtOFwFu8g3ymeSFFtruON9+X</div><div class='del'>-L1+oLCvaNibnIFsijlhzgiAVvGdUtnj/jwGpTkkZeTN1uxc+LhevB7cXzmPZju9v9SqonKEELMtK</div><div class='del'>-R3uROZSLIqdQhFb2vdoJmHWpst8HI0BwIuZ58QJOIevPsoxiBHdCGWb9xhDZVRS5arhdFnvsWW4V</div><div class='del'>-BfcZyzxJ+ugoZVOu5ReflAtLXmWmvO87zYajbZ1LeAEWKsfFOEpjpKSXLsvSlI2zUimxKR/993j0</div><div class='del'>-GBn/uumTl55tTRBXFoaR3lAYZ6KCcEDRpm6w/Fxb5ivEkVpJ4bay2AkOJFtB2V53fwD71EdwhZ14</div><div class='del'>-rrRqHGhwv8nzTM1TZiljo4i95Fk3H3pqQIiW2JWHbxcbSooDy7oJw3QTIS/cH7vAEGx0zPaxWI/H</div><div class='del'>-k1JrrZrSElbwnoBLwcMwL0qaxpHehZ4dxwnd7neK4/WTFBeVGlKVgebb5CieraeeshPrAWNq1dHH</div><div class='del'>-Mb29/WAHZbnQ7O9Be7SuLnMC4C2k7tu20f1+9yoS7C2wGPuhp/pQa8uG9wKOg12naA8gMXcZHpM3</div><div class='del'>-qge5Kk1TivkkafVUVNqo9GWJKWP4w0W66ZqmUSILegomS7iQEAgvypK1+Z2o5SzZx86hH+2q7dzf</div><div class='del'>-2jst66rABzz0t3n6NMbzBUCkAg93E4ceW85ODfCPeqynKQXCOkuTmP7+91/pcDzqSM6aVPBL3YSJ</div><div class='del'>-uKi7bBgEtG2peNbx7LyuSmraTqsqTGSsbdU4Tao5fxwtFUXhHT62FZrmWeyoE6qqWkddXT/Qalic</div><div class='del'>-lv9uWYyowDC35/4/Fhpxq9VfHHPvfr3dJQCWpz7jNFFRFnozIWBFb655olRIMY54E0moRUtdxwnL</div><div class='del'>-iaGf6yx/HGkUPn+SxHS5XhzBJY49p2e0AOMYeeEbWF/7vuvkpqpKvRCxD6Bcxe/Os5SyLFcAbhhH</div><div class='del'>-xVSwZvKcHbSsC+/j2M6u70UOC7hPwasATEsAjDjA5znwvBXtd2Uad0ePIL+djAVBQHEvybKWxw0O</div><div class='del'>-NBscyuklmwz6Z6TY8sI60L6vEv9kgQjEZ3X0/ft3DQnlQyZSlqDlB3Rdp9MFHEaLQTfVilrGKPjf</div><div class='del'>-HxOAMCXgqPL9k4+hs5lePGNFpxvHLRRrybXvnaP+hiEVZSlpsCcVmqB/5BN6JiInsNl3okHAORhL</div><div class='del'>-4BmgnUIbgnn9tq2qAkQ/i8PTkVISzxQDIh33LmO9OZkOu2kL46jBiReXfb1elYCDRV+WpVYxcKxx</div><div class='del'>-tmirI6pME1VVSfd740lQH8MsOMePbeC/f3+lqio02vt4PFJd19T3Pctxl9k7oGFCg0qo65xEGFgK</div><div class='del'>-+x5kXpDG7Xanl5dnvYnxmbmKzYWkFX7KWygKDs/d1k1FXPYQsZ/FS1paV0ozdgVG1Jfl6sNmTG3C</div><div class='del'>-pLqoZJTYSIUA7wWbiMzrdxI+R6IXbxxHdLlc9RmfjgdJT169DI+u6yk+Hg98KwmCjh5o312cV2xy</div><div class='del'>-3/Z9p7cfb5RmKYtOspSINnp7++EBRviANp4KqkE2jyDPpwxEGixKFw+1fqoKuFfzVVt2YTHifKG6</div><div class='del'>-5i+eLYsnnHFxy6Hnhgyw835vlHoKvTtOWuu+cj6f5UXlFEWd2TilZuqxLRnzC5AvADRdDRwDx26D</div><div class='del'>-SMYJqxy4pjyHDQeh40VwtcVmq6FYmdmDEQfNPC+6MR9dhHDrzPMiugJ2lGHb9kUTcrBYcWgDhGIf</div><div class='del'>-vk7BQVcGr9qSPbZXzgO/4JCNuqK27XQMHIY7C+wxAAAgAElEQVQJBUFG6zo+yMD9gE3cjucT29HN</div><div class='del'>-tyu1bUPD0FMcv9A4rnLLl4qKo7XBGsANfvnjD8rzXCda1nMBIrl1c7023rnlOeBz8hRpV6djJF1Z</div><div class='del'>-qjguq1lyJ6MoVMtxhLtq8Okw0LbFXmBJGG68h4kPmF0uQLUBM5mGsR4e4p78P/7H/72XZSF66F09</div><div class='del'>-/fmHG+5zltH9fpc+igkL59OJdtrpcrnqCQp9fxCE9PXrN6prdsCJopiqqqRtW1WjjC/AizFSRZ1b</div><div class='del'>-1L3aKDmtPT+Ir1+/URSGVB9qwRRmr42Atvx4POnDdm4piSDqkYA1sTFqCLT/KgtmUKHf5Wpj1c3D</div><div class='del'>-v6dXPTaeDasrc/r++oPKsqDD4Ui9xqs7TwVQP/nfBQqSoi0JglB9AxwYxZvuer3pDb2uK7Vtq2zK</div><div class='del'>-NEnp67evPDkQqjHeZxAEdL1eKM9L9jjcNq0wHklgEB85XYENXWXde9u1WnF1Mgev61oouy5ODlZk</div><div class='del'>-lsjj/ByY5lpXFWV5rvx8pE0z/yHwEHmeFLFlHacwpTKGzmiZufUYxb+wF1o5vAzTJKGirFQgxIdI</div><div class='del'>-rDyTprkznVwuEHx3pEKnYsUFP4ZlWagq2fob/HtcnhbH4VaQgUG8C76MuGphOT1X17YaxDsfx5Fu</div><div class='del'>-txsdj0eqyor6offEeNh3WMfDMFJdV+pnEQkF3Zm7JhT89tu/70mSUF1V1EhPB9FM2/V0v9/p6enJ</div><div class='del'>-c/6dpkmCF04SXsGsvKos6Xq70ffv3+nLly80zzNN00T/+3/5L3S733WOC2mpFVvglm3bRm7eWMCX</div><div class='del'>-O3358qybGn+3bRua54V+/umLloThn7qjBFTXpZao+OxOZrqphTg83aMo1Jz3f/zjH3Q6HT2LLksn</div><div class='del'>-xtwWwCYWaF3X9Pb2g4Zhon/5l78ok80uYjgowcACOgWrO7jdbnQ6ncyGIW0RDnWtB7DaoWvQ5UDH</div><div class='del'>-44HutzslwrbDxuNpDbPg+P2NniejJWddr1c6nU4PzE4HRoLGiylQWeSU5YV6J97vDX15eaKuHyjP</div><div class='del'>-MzZRFRqtcwsKjF1bpBl668o8eC7ZI88PAgefksbSRJ8vLLGSJKWhHzRiC9jHo2TdthGYPhR5Tkma</div><div class='del'>-0X/+53/Q+XxWVR8AaMu03LaNjocDhRFXjzZC/XK50OFwUGAQCcIY26GV4PW4KbbC76eky8eVDsda</div><div class='del'>-n9s4jpojcL83WjlM06QHrNXttG1LX768aAAwFLPgbIRlWdLxcKAsL7ScXpaFrre7h0DjRsBCHMeB</div><div class='del'>-+q7R0ximCix+YLbfX/7yCx0ONSUpl13M8d/cLNL0TDb6Gz2zs5neRNEVKmGpLCs6n89UlEfK8sJz</div><div class='del'>-H8JUgu2QepWVso8d++EFFOiGHcXeyQkzMlq3nW63K20bW2f9/vvv1DR3Q6VMdeHnGZND8HmnaaLb</div><div class='del'>-7eYi1LfNU/mh/B3HiZq2pUnYeNCrw97adzziZzAMg1s8y6LZjEgZDgLSNJtpmumPr1/per2ogAQY</div><div class='del'>-CttRLd6hNk0jTdMoWMhKXdd6h9rjWIw/S69ZkGAIrstCt/td7NnZ+RktFg5wfGbMqTGyss7JwBgw</div><div class='del'>-A3dWaaFnTAM7dn8kG4lib1DX6VRQfFt+W0oxDuUkjiR05UJt66TCeMZpVqhFGX5e1/eeAhOKTfu8</div><div class='del'>-cIixYnHzMhPDwM9ARKJy07Yc6iGYhyWqYW/YfAQQuex0w1ZcqGJRNYTTNNH1dqPffvvVc7RBqQNb</div><div class='del'>-bRdeEDp+tRgY4gO9vb9TEIT0l7/8QqfTM0VRSU3T0u32rl+WTR9SBQvxHzDX4MaK/gv216g+7Jdf</div><div class='del'>-loVutw9aZYTGVcFEmfDMeU5PGkCBh962Hf362z+o73ulTeJ2wSJ8TDnifptbBwYC3ahpNi/Ijvf4</div><div class='del'>-mQXqVGN7Xvd5kKwT6mLf5MCwQSMOBU7Vq6/vO3r/uCgpiNlgqybzgO785csXenn54iXWruuqiksQ</div><div class='del'>-q9ifLzH+eHxbff3jD2qa5pN1FdYIbhTcPqP8XnAcsGgXORjgb6CbLnHkFWz+OGYLbABeILxYm/VK</div><div class='del'>-/ATDMBIAejYblSsRYAn4u9ZZ2bY7OFCgKpzEMg3JwwD5+ELoTPJv/IkrMI6D+gK8v7/r2BemLdYI</div><div class='del'>-pOtYVg1c5zHJFz27HWVPoiGwOEqeZ3Jp+JgYsi5cUK6zN6+qkmLLjAPXG2YYCFGACeaj4GYcdy19</div><div class='del'>-p9lZUfMIpqEk4ZuXS/dYbsuMYuPT/2cuLMx+G4yxyKgYAQAlVBpwdcVCxox01JhvTjCeyDdMqOuK</div><div class='del'>-DoeDsN8WZSEuS6LKO0uw+OmnL3Q6nSgIMuq7D9WuP7IQH2O7M+Mqa5lxAEAdASlWJySevbPlFBOw</div><div class='del'>-VqWq8lhoVdAry1L69u27nOiZ8yCU2/X56ZnKsqIgcFXXanLkraAJASe4fe53rgK//PSToutIdMaB</div><div class='del'>-bCPNiiLX6QVKXn6H9ImPgU0JdxwnMBvF4DPTiQJuOcflZ9fnw+HgIfyW4LNuu4p8oEOIQPeVCjSO</div><div class='del'>-Yrrf7zqyg4JwHMUePM8pywY6HQ/a81spsqVOO/SfPE8BVgWy+UjTtkwllpAUBhQj3XdgaFrmYVmU</div><div class='del'>-VJWFslh3dUT6PNqeTUQ4qkmIklgj4rwtxpFb3RgbuKpK2reNk1s0nGARcUclrC9H0AF5Zl0Den9/</div><div class='del'>-5yy5qvIoiu/v758UbOM0qV+Zj+rP6mhqkVSAHLZdKIrck+VaL7pK3XbdzLPr3Tw4ikK631mTzQSf</div><div class='del'>-iKKoUwoy+tBEWYWhGjx0XUth0KlCyx5eWGh2MpHEEe0CrKrRp/RnbdsyndlMWKKQOeIuXSb+dDjj</div><div class='del'>-lj8ej1QWBcVJRlXFYF8nFY3t1+/NnaIfoRKX2N12VOdjJuUkNM+OjISDAQErp+OR4iSRQ8S5BtuZ</div><div class='del'>-diwV4rJcneLNLEyX0BSqwzPGlvYW1s2ZxPT9+yv1fa/P1DIUj8ej5hG4sJTdKO5Yl9+2DR0OB6Y4</div><div class='del'>-x7NXjjssh8vycRzkorPxcYuwM1e1qbOS+M1wDGzZn6bJA/lpMyYurCto204zLSxD1E43pnmirh+0</div><div class='del'>-9dl3Ukr0n01UnFWcY/BaHYizKueJUIyyCzNWgGl2rgm+OGyhQHOE0cK+7bTvG5VFTk3bef00qKQB</div><div class='del'>-CZff6N4tE8t6C1i7JBvhlaaJOMWG3szd9Wi5ptKweeYuhhSzfqemuaszzjTxIYUZ67IM4g9wU2GT</div><div class='del'>-OgaHIU3Se9uHyYrBUumv3mx4d0YZ9juCYFOWJeVZpsaQsHVyz2XzWH/TNJuDzE0H9p038vF40Mg2</div><div class='del'>-FpZ0MiaKHjz7IwX+WAdBEoqRyI2Vyviq4FszSeh6vXqyYtxwuIFvt6sHVHLuAGtDijxXZBoAmfWF</div><div class='del'>-xM/QNRcEtK2bVhiI+8KmwO2WJinFSUa7HHwuUIO578vSOz8GvXF5fQ3DpjiEnb8jhQqsTFd1ur3x</div><div class='del'>-mIn4OPrDWBQXgTWMHcdBvCGdBoYPn8mzlMPPhO7BXZSOqmwrTbQk+B2agxhGn0bk+O8gCJgJ6Nh8</div><div class='del'>-s76QaRo94GhZFiKxLELfjzLzdD7xg08KCsNBNziXH+yzjkRbi/pbv7wwTBQVX8SNx94ODNRMCmJY</div><div class='del'>-/gBKLpghZHmh0kpUMZBGghGXxDG9f3xISMRBe29sDGyEMIy8l2ldYhCOweVxobFl4zRpyq1FuwE6</div><div class='del'>-xXFMu8yR2f2o90gyllE4z7MyBFGhPAacJknKISPbrrl1GGllWarVHfIaLPqMAwuHYJrwjDlLU2ra</div><div class='del'>-ltqupfAt9A49/H44EbmDaFcTjEgISjGyIIS0gsAPnnmnnh8jfvY4zdQJe7HImRCDBCYchn3fC425</div><div class='del'>-88pebOhpniTgttAbl3kmTOdm5Jxt0QsBT8HJCMQW3MqJH0NksMYfDVdwiDklauRNGsKwNsKr5U8D</div><div class='del'>-O2cvmSryDhbbxlpQ1FYEeK6wc0flCysyAOZRFFEMBBU9L6in7HSS0Lruao7A46VFfyBKjbqupKxY</div><div class='del'>-PHJNGIbUDwP9/s8/ZGademWIjTm27sKuhPdvzUcvv0cCEKSZ69Zp/BLK3ixzVNiqLIQZtTCZp2JO</div><div class='del'>-OXo2RHrHJv7a9ay+FRWz41JOUO46WtfBq0ogYAIfH6Yop/NJlWU2LvrRcBPAKKfOZJqmCxNUT60m</div><div class='del'>-oh4smG/fvjHLLIyoE8vozSjF+PsyIaYoWLIaRxE1bacMOcs0tLbh+84LrOvuXl8NYQs894gCveW6</div><div class='del'>-rqdlWaUkX9T0ZF0nD0SzPgvzsmheobXFtrLz6/WqrRvWn036YVu1xuPLp2lGdR1oa8ZU3tEztLEB</div><div class='del'>-Gn9Wmbpsgl3xHR5huvj6t7cftG0rnU4nozSNH+jukby7XaY9redubNmY8EcEI5Nl0R8SmNKrE9Em</div><div class='del'>-CceoGn1Ha5Yd13VNMVszj57NNNR2DLrwS53kh0BMYQMiUM51XatlZ5qGRldfaN/Xtp32+zgpnbMu</div><div class='del'>-f1nQOuua551pEnvpwEB7bdinXRxA8rmkSrQyQCkPJPVwONDxeCSikMapURlmKiEebddLZVGqDhyG</div><div class='del'>-lHw772o/FsejZ1XuEn7A/CLPCp2BqpXCzWEP9lZx4Gyo0eF5XtI09nS5XD0ZM0hAqxwgEIx8+fKF</div><div class='del'>-Fol33/edPi4XsZPKvcguAJNc+q66mC+Xi8SVjXo5wIeBQWDkKhRKs31EseEJyC6/HP9eFLnXRtgb</div><div class='del'>-znpNYo4dhoFUDqFWf056nVJd19p2hFLFgGtgzWGAt4BBycS1xJsygAOAjAuLc1i9hwO7B8VNMKHB</div><div class='del'>-Jsf7AV4BWj1vyk3p9rxmV8/aHCQwXLw2DAYmK6g+sGZxSYFIBI0KPAiaho1FijynWUxt4v1PLLym</div><div class='del'>-2amKMC5yo5LME+VYdHddmZXFfVtGy8qmnfzia5rGnufUMj7CIn5M+AXzsK4qIZpERDSrDNl6uGG8</div><div class='del'>-gUQYfE5YibdtQ6fTUd1i4C4D6W3XtSqrtKcu+m+rIAQNNgqDTziG5fPzgnsEORcaR8e5R1ruOLq4</div><div class='del'>-KTundzeEA3z6nisbHMD4/XVd6xRjFM96Dd6cZ6HTBgqyYnEyM7LTQ8qmO0HkE4YstoFFFfIF5tm5</div><div class='del'>-OyFcBC3JY+w6Do2iyDmGTMhX07z/6XjUfxaxoRWHn8ao4zRRWRQ0LwtlaUrfX19pnmeqqlp4Ef70</div><div class='del'>-wX5P+EzYSnJdVzUm4X8deGW6BZhd8nWolvkq+eWxAxVFQcfjgaIo84I7scYcFXtWARaL7XJKZUN3</div><div class='del'>-XasXATNtV88EN01TsTiPaRpHyrITjeMk7MhYR4lWvp7nOedETOJegwf0qHF+f/+gX375WRVw96b1</div><div class='del'>-eng7GrQOp1EUUj841VPbNp6FEmb0nXiaPXLD66qiCJRgA1LCm9+WwY+x3MsyCz00cyaOMicGmQmO</div><div class='del'>-Q3aRKtiYpNQtvRk3hqKT4Ipg+f9x4rEpxha5HobBux1sLoJdeKo8M4fnJI7BqAzw+xAG0fWDZvul</div><div class='del'>-WaHpS1i0rKq7yu/dVL56vzfKr3i0BYf5SVWxkebhUFPbdlQWDLKCIVrXPF5klplzXirE0QbVkvV+</div><div class='del'>-CMKY2ubuWaOB+WjXEcRYaZrRWTAmbhObTwcFvBbv8yygX67tg9UNWD0LMgXsO2GSWqAXBV+Mdn04</div><div class='del'>-sZqVy9d1TcfjicIwoHWZqWk7+vF2dZOYe0P7fvd6eBc6u3l5lLgg2a17UD9GPFtbZeIyCuS7Yhpy</div><div class='del'>-vV7peDzqJY4pDNZNLJOTcV0p3raNo6xPR9VJ84J1eWY8jyy8fh0fBMGGGL9gdJTEkZB7SMtvAHFb</div><div class='del'>-UVI4Lx7l1N6kithfr4qWv/14o7IqVfqJZNaPjw8tER3LMKGy9EeHZZHToGWsr/u3hCTObV89CypM</div><div class='del'>-PGwJaAkldq7PsdmONDNNoyTJZp5e/zEXwSOSKHff0WPtzYdDj6W3Ia2yMObZgUo2UQa23Hifg8kY</div><div class='del'>-tMQlvN88z/VQ6YeemqZVvT50CnXNo0e0kHbujwh4+1xxKWzr8imMFWNJP6GalEOwLMzGTI2lvJ2q</div><div class='del'>-2DId8txYPPUt+m0rFGxiGxOGn7l7DL5Qb20brIH3AH/IeR69PImiEGatOczsev8z0NeRqxicvd3u</div><div class='del'>-tCwMVMKuTEHGkAV867bT/L/oeq8dybLkStSOlu7hkaK7SV5gZv7/W+ZlLgZzQRIg2dUlMiPC5dHy</div><div class='del'>-Ppgt27Y9ahIgmlWVGel+zhZmy5aQNYvLlrU9pLiW8wWYaZDLT63xoyiiLM+pLCuqypJaI9pYFr4x</div><div class='del'>-D3VFUZxIgEGspbB1XLEgEcILsyyjtm01TgkPniOzSF/uNI0yiXAPFl75ePhFmevYrB8Gul6vmg/I</div><div class='del'>-6bCVij7caITjl3nenlA4O+8AO5Gw45QkST2PePRb1oQSC8neKhYcAhJdliX34CCiRBEFwWJCJCJ9</div><div class='del'>-js+bwo1hI9UqIKHWxoRBAGTHh2ypnXrVHBYuiESDfC7cgLYCQjvF0tjAO7BADQYIBYq1neHj1rO+</div><div class='del'>-BOCVAJSCFR2sy9DKrduuF4dLJSZN433eMBYHwia9XK9q/IlnDDIaLhBMaUCqwUQkzzMKKDD5AqEn</div><div class='del'>-6LHR55bWbseAOHByER8BP7AeEzaMxClw+bvD2Zip75Hy/e1ocl4+U3yhhwgCppKnWfanPoG2Koq3</div><div class='del'>-bRNWXE1xXFIvwQVRGBBlKd1uD+r6gZrmTft/SD9hJ/0sy03TTMcQruxZPFfgLOUyJE13LxDymQSE</div><div class='del'>-8ho9XZK6/MJlkamFmDOA4ACHmX1PBfQqOeRCbqfnktc5BPMMuCwZtMzSlGaTioQbyVUzrZe7zlbm</div><div class='del'>-fBpXVUVVVdH7+ztVNYs59m2jnz/fqChyAa548//6669UVZXaSQPD4KkJ8wOsFTbchgBuJkkiiz40</div><div class='del'>-zk27VkMQmoRhqKGp1uhV3YNkkrBgw9HszbvhsY+Dv2lb/fkIl9n3SIlP1hLMklvczD3W952YTWQN</div><div class='del'>-NHFBoJWzGZIKpsr6A/0ZgCZ0GYggh19jGEbaNuBnaDW4bbSb9Yc21+JdAEAt8cs6NeG53u4Pejwe</div><div class='del'>-9P37d09G7ZyvQnVSfqa5R1EqorfOO2TxHm1UueIJcmBO06ijVJ+lCD+BmAbsLeZK8ygoCkc5qWda</div><div class='del'>-xPQDHxROJC6qOPMIQ0BgEZdkuc27AczwwqZ5olKCDXAAzHK7jeMgUsbaM9zs+p7IsN1sHJQtvzAL</div><div class='del'>-hRjlfr/pLQbQCw+v7zvP4Rcegtu2UZywE08hmw8Cn7IsXZ6d3Chc4YQyqps96y81MRGM4Hg80PH4</div><div class='del'>-QsPQ6Uirrms6Hg7ax0EUBTEQFocKaIwl2yBmm3i2l8tFJyiIJLOAFfgKwCCwwdjEZHsqrVflRgC4</div><div class='del'>-xC2EGzaOYoqi5VNFhGg5e9BgFBkqil/ooYwIOhfHRcpUxKFox3NIasboFu8efTl4HBbFB2/Btp5o</div><div class='del'>-2Syt2B02n7n4wJmAKVl7NtvO8npI9WaeplGt22wrAK5AmiZ0Pj/YFOUpbMTmNtpcSxx6zDdxvoNJ</div><div class='del'>-QnoBONk5STS70yYE//Wf/2ffQPSRhccz91BQ/Z6mcabXLyeqSo63ut1vOpsGkARQDn8WCwisrK7v</div><div class='del'>-1AocJTn05VhUGAWiPISTCUon9Ib7vtF//Md/0ffvX+l0OsnDjj89LLQweChY7IyoZrSumzobwVVl</div><div class='del'>-mmb1ucOf5T/PNycz2woaZTFCLHUX5xag/EkcixHDJBhEwcSatqWvX79Snh/px49/yO2z0evrScRT</div><div class='del'>-F0+jjkBLEiYlemVo4e3CxILBdyrLwmtVGNEOleJspzA8u2bfBRiYWnT82Y/BzfnJW8iM7s/eRrAl</div><div class='del'>-up2hI94Mz2wWPYnFOjrhwNvQDrb2GtW4hKvJ3szKJzocai/RZ1NyTaTP14Ggu0aF48BlVN7ZyKNN</div><div class='del'>-y7LU+055ltNOO+0bR6zbCoX5J8wzGA3HwOpHrL/CPM/09vZGr6+vVJn8Qn5uoefpgM9pfQDsWJcN</div><div class='del'>-XRKt9mxwDVc1MhW4Xn/bkaDr+jz3F//xxw/OV68qCgJOkrU3LUqaZVnocrno3BPA2f1+13x7S/2E</div><div class='del'>-+g8nOqSdP3++0eFQ08uRJcq//fabkhsQuYWe7tu3b3Q4HCTOOvRGbtiMt9uN/p9/+WfVA+DfYyyJ</div><div class='del'>-FCLYPU3zJA4vnCP38fFBX758Mc62uc7j4W1n2Yp2FJTEEf32+x+GBMIbqK4ryrKczuezAmR2k1hE</div><div class='del'>-/Hq9qh4dSjkg4hYwtSSaJIll1p/Q77//phULeA7PYZqoMGz8NW7sj48P+vr1q2fpZclHz2vBjkb3</div><div class='del'>-fafb7U5fv37xHIJA0GKwi2/Ipm01DgzkpH3f6MePn/TXv/6FyrKk8/kieE+tEWZJklAUZ/R43DyU</div><div class='del'>-H1OkX375hb59+6o9tG1Vn1OJizz3Lhx2lrrT4VB7gKwFIDHxcJVb4LkstW1Hr68n7x09j4cRjwbg</div><div class='del'>-+euXr5RmGd3vd41J37ZV1+RzeKmdntgRYZrE9PPtg5mgJi0JeFyaJhT/8fsPqupKuey//fY7ZVlK</div><div class='del'>-r6+vyvoax5FOpy8ikug8Zl5ZFPLQJgnNyJVpt22rF+SBRWXde/Cw4CfAvnCs6uu6jpqm1QWfJLEu</div><div class='del'>-GvaErymKKgqCu5bb/N8iBTHnmccyqDBcpFKnQNO2bTSNoyquwLiz9EssgGVZ6XI56wMFCOU4BBFn</div><div class='del'>-0C2jsvKsJBU3Og4yEFj6fv0UxmLj1qwfAyzGcCBi9IpDfN+JLpcrH6rk1JTou8FWs+QW5fAnqQHb</div><div class='del'>-yJtwWPvsZ4rss20b5tlI98V7B6sySRI61BU1bScWaNyboy3ELw56PSihC2KaaWJq87rtROOk7x+t</div><div class='del'>-E+KwiAKdItjDE4cR5NzbttHH+SzMu/STug9gdJ45TQx8AJ4pvTat2Y0TdyWIKX5mPpNmNYr5LJ5p</div><div class='del'>-07R0PNYyvs0kKHSj6/VOdV2xFse0yZZqDx8G4B9d16rnIiqluKor1YOP40RFkYvSjIU9ccyimPP5</div><div class='del'>-XdNdLPI8L3AjybUaCKOY9n1Saa7NWbMuptYJaN3gmJJr8gpuLEhl52XVGyOOWcqZZaNHckAfzH8H</div><div class='del'>-+w8UOZdpNl3VGmJO00TzHEh4ZqMLDZUQx127GCyc2Fb/jdASjNFsUhEzsXj6YEMt0Zviz2GEiA1t</div><div class='del'>-Kc+KbcQuLwF6cR4RRaqtsEDqMA5UxaUab+AgfTxYj5+mibI052X1jEt4DQbaEqFkBYfBhqy6sacD</div><div class='del'>-p9CD8vPhgwkbP80KCgUf+P33C9V1pUSleVm9PEGMtNgss5SNcdafz6PNUdZa5NmJP0uQ2Q0pexpD</div><div class='del'>-TiZB+Wldrs6JuG0bejweGolu9SjAssBUxESjbRvNdXh23IYy0nkgROqIbL0K0pQFdUmSURzze4eG</div><div class='del'>-oSwKut6uehkREX18fOi0Dqa0vJYjBQEfTcP2eyzjLZkOO0708vJCdV1TGOYUBL0ackRRpKWQJSWg</div><div class='del'>-fEe/cblctDoACgymHfvR3dQbAIcO2gX8PbYMswmreEnny9UtpDRTkRBSb4CUcv4533Jd39NNgitQ</div><div class='del'>-ygGF5e9IQmtNdAoyyEa6XK9qMQZ6JZulxCK84U2EbAR2P2o07z2KWBYMIo8FRO1iQ0UCu67Hg0tA</div><div class='del'>-VFYcfRV5IJUzLEloVSkxZ84fj0dh+SXqSmyfK4AvtqLmw9WnhDMNeJln5WDg9gpNFPefzbP9xOld</div><div class='del'>-M+u3baM0K2hbF2qaXtbVwR0g8+IpURXNh6RYvP7SNFMyUpKkaspZ5DlNs4u3W8RNmLMlElVoWotv</div><div class='del'>-jEJBmeV3ihbVmcJUVc3tY1lIr+2APBvOiUPMui8h0s1WTlmWm2kNqxvvj4f3XJNEHIKjSByqNo1D</div><div class='del'>-CyigJC0ojlvd5OAgANM6n6+UZamavha5MAybhtcGEakHOr7M5XLxuOg4JR+Pho6HA00S/gGzBqDD</div><div class='del'>-IEYURU77tsn4atGpAd82mR4YUGfBZ9DJXifNn8szSQA2fQ5O+LbrvTEkZuPYqEFA1DQL3e53AZJK</div><div class='del'>-lYau66oBmU46GcrNTpRmmeQWBKqWrMqCgjCkvh9EMhzrPBxe8UscaWiDvVGeyU7Pv6wTEUxSQd8F</div><div class='del'>-MwyGlTjE4AMHujZcedldt6Y8S6k3YN7tdqNpmuhwOJg46ZKSOFZjUFs98MKOJR2ZDyV2XZqVUPX8</div><div class='del'>-nWxCEgOMbk0kScYmHfNEnQCVdhNWVUWPx8MzEIWjjSVcuQBTpsAGAXtCwpwDUttFbOzBF8EhkiT8</div><div class='del'>-5643NzrFwY2EX6zJ9/ezOgRjVBwnGQVhrCU26x2I9j3+xGjV1lCmES7FKfVjxdKUwij2Mv9uN97w</div><div class='del'>-m8SRO+4AiaX5LKK2WcaxqRvBhgHlRU2Pe0O7HKhtKweFfFep7CIZIYyfiAUOuAo0R34VcQfLOWNv</div><div class='del'>-JmlJBmlWmNGDK33gvsJAIJRKszFPiNUoAn1MWZVavqu5hqgWp3kiokSrDPi3p2km1cAq38FVHXya</div><div class='del'>-PtS7H5RQvDCmTg56A/R9R0VRahINV0CxItjo64ZxUq06iC1JHH3qoe20wsqtYT02zwt13UPxAf6M</div><div class='del'>-AXVdT1mW0+n0wrkIcqNkaUr3x13MSA8MgEUhLesqxCvHgDscDnR6OdKyrtQ0rQZ4ctJy7JFZoCdn</div><div class='del'>-AlbqJLOGBu58EXpPJMY8DHY75pj0iLaVtQebuX2BuA/DQFHIoBqMWzEGtF6P4GLMxpQzzQpa2o5W</div><div class='del'>-STqy7V2aJhIbx447uCBGaVux5tHuWZo7nKPQIvOUa9Gb2I7lrKEpKs08z71wFYS8IutwnGbPdsy5</div><div class='del'>-WO1GmRoI5XjwxqOY3tiUbnx2tMvT/Upt11IiVShCZWyoa2xzw56BjHVd6Xq9KukkikLJI581hdVq</div><div class='del'>-nfGl2IRx1IWEW5B780mpqM9BneB17/tGeV5RkefSUnwOa8SiBkWZjUIi9exHxgFRoGKXKAxc0IkZ</div><div class='del'>-P+HE//j4ULeZREAre0O/v7/paAfEpFgcX+D7Dy84INXjNFFlCE72JsOhCOwECa6Yiz+P4k6nkxB/</div><div class='del'>-Mi2LucUIVYTFFuzsK983LXV9p3wK0GSjOKN17Z+is1Z6PBpqm5aOLwcvPhsL+M906Ou60eVy1o2O</div><div class='del'>-9+QCMbmf74dBSFLbJz1EkqQUBItiEM76zM3ILeAI9Sk7B69EBlBFxWrp6mmaiB1YIsSwTN+FdQpO</div><div class='del'>-00QdhqBKZRDyhYg2nY7Y3r/veyrLwuYt0FsAACAASURBVPEbJEQEcXaWyo2KDlULkrFgpmonK2hb</div><div class='del'>-7veHYkb4OZjaIbsClxeqd45YPyogjACRJEnVOPbRCItxXVcaJ6fEs2glKKUgcPAIcJPEn0RHDWx6</div><div class='del'>-OSvPfBwHqirn2mojqPnPOqou996bh4rDRinUPxMLj34yRqF8YHV9T9M0eo6qTYPbfZWXWCr6jI2I</div><div class='del'>-AyESLQP2QlEUVNeVxnLbA6wsS6OTZ3szBGryz4vEZiygqixpmifjbLx6Cr4oipSwA6EQbzL6BKzF</div><div class='del'>-cUJZmlBelHS/32nbO9G4r95tURQ5RSHr+d1t4Vx7mBCy0P3xQycmz242QeguAz4Ad2Wq4TDA4W0X</div><div class='del'>-dZ7ndKgr9jMU8VMYhrStKyVxTP/4x6+UCwMyzzKaxfrbXgIKcE6zR1Z53tCWMfqs1AOuAhsuJZ5N</div><div class='del'>-rsrEpGYWPUXXdfT6+kpxFKuRiObsrSsNfUOTjBFtddy2DRHt0pIl2mqi145MIKnVXjRSisOCnsvx</div><div class='del'>-Tn+vzZGEliPPc2qaxsPEwI607xDahLquNEUa3xkEPOazcLUdWw88e+Oh1CjLkl6OR3kwm+fistNO</div><div class='del'>-AcEgI/IAlbquKI4iuih/3r2wxKSTgPPP1NeESiEbAfl1Cb+r2eSpviB2Q0kUGErk4XE5zWYJmA7Y</div><div class='del'>-OfYufRU2JnrLuq4oDBOal05vIHvzgEc+S4CHZb31IqLad6IojilcnGmHS/oJ9TZlM5FM9Q3gy4ON</div><div class='del'>-aWPEOVPvLoSO3KMyIwYcVlM47X1XZbYo43BTrlC6rv3kD/D6+qrKNkivIcxJn0apeJ7suhNT1w/q</div><div class='del'>-qwfeQdt1lKSpkxiL0pEnPInmMwA4szHnwBCe0fZnZybo6i2vZF4cym+5DrfbTcwzOmW3vry8iCPU</div><div class='del'>-qmo/ENpcOtOgoaZ29FlVNVVVrRbr+IytCTt1lPbI009gLVvjGJfo4zIGWOqbmkxB8i7G9/cPIf6k</div><div class='del'>-ymnJspKicDRs3VAdj1BBb9tGMW76zniOo6RlM85YRnKjUj95bjp76C8WonK9jc+7TT3F3PX5sKmq</div><div class='del'>-Wkk2P3/+8NBllMs21RZe8rsAXxDGbLLZgG3kOfsKwJ3IevbZ8RuwCm57ziJdTnU6cb3yXJ03Tqdo</div><div class='del'>-q69g23UBYvPYX1aYoU5BWUZxktIuoBhaAjxTHNCY9yuqLGnJ4IdbhmCaZnqjWx75MIxit80WZvjs</div><div class='del'>-VVlqBef5DsSRtFDkvQ+MNWFC+uxUw+X9qDN56/OfZgUN96uX/GPZhM/CqmfVnB0zPh4P8YUoTby3</div><div class='del'>-09XbfhqXQJ5nMhV5UYNZTKKWZdXpAE9xCmfxJu8mTWJ1KMoyVk2GYUBtP2mlDI6GVU8iG3AxEmUL</div><div class='del'>-LDqTkpKCoFPlYxSF1LQt7XujVetmDEAhPgO+1feDxMjztKQVJ2LwZ/7r77/Ty8tR1LMrawGsVXQY</div><div class='del'>-htR2vTd6243PWRzF1PeN28wmhhu3PBMkBo/E8owOW+GDqs2CgLZ1UXIDQAvbF9l0H4z7+CTPdDM1</div><div class='del'>-zUODH3XUFoUq4oB0+LPHn5GeykPDCzydTkJ8yo2GO1KePZDxHz9+0rYudHp91enB82K2JqH9MNAu</div><div class='del'>-4Rp4NpbhRRRou4SWjJ2Oe681AsEHv3ddA2HKxZ+ixCXky7x314/inWI9EDmQad12BTzZ5mtQiykc</div><div class='del'>-/PAfdLNzpseeXk+C16zqP4FS/XZ/6EjWjnOrqvZGi7bkT5JYx6NFwaxKtEvO2nww34MoCgMF4NIs</div><div class='del'>-o2VeKM3YnReTKhyMZVlSnmfU0+iHoYwT7Ttpa8wWdK1ueADfIFsp1dpkXH6WMjuhF7cVRN3S6xQJ</div><div class='del'>-E4nAxLnbSgQ5CGinYxPJnucFt5nCASkKVtXW9YEejzvFQLSxmKz5JW/SXa2q3Q2TGlBuo20LPD80</div><div class='del'>-oP0WbMMLAI6A0gdaaZhBgoiSS9bbc2Q4b1b3RTkUk8eFO+00DJ1Hpd33XXuu6/UqAhGrhXc2U1DS</div><div class='del'>-HQ4HLbNwkyJNKIozSpJJQj9TWoJZudUw4cyyA3398oXGaaKP9zMlSawMrOfvY/tauziMNYv2sPDm</div><div class='del'>-n2f3nPDZtfSV5z8MA61mNm11Csg/BMHpcr1SmmaepNtFV9s0IHd4fXx8mDATly7dNK1OBLhVDBXf</div><div class='del'>-iCJJIzIgIg5/vgk3nfLAr3AypiLOcJOrQAZNI6k0rDMu/3dshMlIy2Htfbs/mBikSlC+vXdiKnQc</div><div class='del'>-x3IhrbSu/iGOUfL9/tB/tqQiUL6TxBHh+n7wQkTsYcsWfKlJpHbOvVh/uVCO953X2DMdeBgnbREw</div><div class='del'>-jcB6qeuKiDiKHWzDMJQ4NowYbDgETheUgG3bUlVVKvFFTwGQyfKkUVE822WB1QfjQvQ6UOZZ4QIs</div><div class='del'>-smezuC35xQkoDEAkxgi4HVg/PnrcaHDwq6qiq5B78MBtJh2kybuIk1j622kbge9mxR/YyF+/fpWZ</div><div class='del'>-94HC6EH1gXtE9PnAIqBu8+2lt0+2YFyCB1rCzfNMwSdTDCdFZbAv9iYcKI0BGsHf8P64K/BUls5/</div><div class='del'>-Ds/6/f2Duq6n4/GgwaexAHp1VdHrty9UFrlWjGiXVFOywHyyUt4G2HJcfWy0GKeaJEnodn9QEscU</div><div class='del'>-SfApAEw7ckRbE4imv+3OHtMRLs78eUhUkX47gfeG2bjKhbOUxnHgKVKaUtu1dEpPXrUbx9x6ck7f</div><div class='del'>-gaqy9LQAcZw6x6h5oTiKJfjV5T5aQpVrlUbKMnqKy1s9N6yqKikVlaq1xcdoj4F3J4KaZbqDy5bF</div><div class='del'>-fA+1oI8ZLY09iyvLVtt3RhYPdcVzcJHE4iXoyY7MPAk/DAjpsJEXIoGyLUtTleZawAW9m81tw2GB</div><div class='del'>-Htq2K+Dtg7mHeCeYe2CchfFMHEe0StoO2GkudnnTFGQbZsKLdvHENwDa8OecRJMPO4SB8uEYUZKm</div><div class='del'>-9NvvrLMoilKdaa17z/5EdsKNbq3UbE9qqwX+PQzALuuiWE4qzxE0W91EK9teg9m470RVVapPHrIL</div><div class='del'>-932jPGOL8K7rqCxL+vLllV5eXuh0+ivNc/vEhNsoTXPFCcAVAXGItQbtJw9AVH+w8goCop9vb9Q0</div><div class='del'>-HX3//u1PAzBw6MEU1YKm8JHAJsF4FRcXbtiqqnRjA7tBiZ/nGT0ewSfLuHXdqJ8mzrwoS4qTjLau</div><div class='del'>-M9FdTtY+jjMV4vMAQ5bRmLpglBhFEdV1LSBeSY/H3RMuWTARmAvovnYigp/7HKaCaVaSBOqLEIQh</div><div class='del'>-ewJaRhZSgJEEZEMuNqPxd+UO+O6uv2Tb4UH57JYVlWcZbdtKNzlIMDVAP2/HLNaEAX0hDpw0zTVH</div><div class='del'>-gBfP/km4YufWuO3neVa+P0YhlmOAMAoFXNQfYPXCSTCfxonOlVRnXG6ci8zj0dA0zSLeKJWogQMD</div><div class='del'>-1Y/1nHs2n0SLtO+Tbm6k2UK8EgaOCQduP3gIalohfzdKaE7BTYWh53sz1jWPPYvySMM4CcmqlP44</div><div class='del'>-F975u5b4YOgh4NPansF6e547r0e2mgKLC8VRLNLVm1YXocmitOsEmx9TCqzZosglX5B1GKhccaCr</div><div class='del'>-wCdnEA2VAzgBcRQpr8AeuHakPc0TrXJL2/wHbjcOFEW9176MsmesCQueW56l6lptLcnsFAS8gDRN</div><div class='del'>-6X6/e9W0bYGex4NWIevWQkTBv/3b/9qZYtooZ1wZRcY6Gmkybn6/C5jnct7x0MDXfiZw8I0j1NWu</div><div class='del'>-V7oq00Ij9h6QPHhGsl3AJb5IlnHENOKRkC0PsA46d5h3wFKJhSixzlURBmFTg/A99n1Te7S+H6gs</div><div class='del'>-SyLaJXGWtedd12ugJvrpYRxUw2+NTqFyW7jnojCKROoJg5Fa/QmWxaUDwYIrlpt8mmc1L2E682ZI</div><div class='del'>-IKsuvOfIqGfVHlRy8Dx0I7ZAmZ84BHg0W9LQ97TJZtnWnTqZvLgc+0S16mCJ2tYNKc0+m3AR/In/</div><div class='del'>-rLXvxq11uVzoy5evaoltAzJRsmNtVGVF/dDre0cJDYDZovkQOHFbtMlG3w23gSdA8ICAlR3WmPb5</div><div class='del'>-wq1gnj8JIJ24+O0woG3bqWkeFEUs63UXlPs70yShNMupF14LLkS0TBB9Kb6SZdQ0jVa48FV8fk5Y</div><div class='del'>-NxbbwUQpzwsKfvnlX/ckSejt5086vb7S4VB7LqK3211CPRJ9kTj9vcy6hfPXh3HyaKKPB9ty42bO</div><div class='del'>-80xpnIiMatpWZ/vw0sNt/v7+Tt++ffP018vi8IFFmIMYUeJhIUL7fL7Q9+/fPPBoENWja1OcwScA</div><div class='del'>-mSxN6NG09Mcfv9N/+2//3SvzQe+c51lyBchDteM4EZQ+ovf3D3p9fVWRybKsn1yJcCjiMxciiZ3n</div><div class='del'>-hW63G72+vmqVwDRpbmcsEARDC4wsUeHcbjc6nU5edWdDSq1yDjiBVbrdbndVs9lRIByTUS4ji8/Z</div><div class='del'>-wjH77h+//kqn04mWZdbPbOPAcGmAjWe/CxHRP/7xD/of/+O/U1keqOseYi7TezJyjJXjOFaeAbIL</div><div class='del'>-LpeL+lFYnwIrakPLaydW+PXz5xt9//7N4xpgfQP3QptmA0MxVYGfAg5KvPtcQ2EWLwnq2W8A2Qwv</div><div class='del'>-L0f9XGWR6xrLs0xGhZ0HHLrq80Ffv7yqOOnZhDZmU82YTq+vdDq98MvoOu0Zt22l6+VKlWiPUTbO</div><div class='del'>-UsLB7z6KIhqeeAG86VftU5yIhP/yZYU5BN/SWcoIbSJxUvZBYFxk+QNg9m2b/J3KugM5Z9VsuUE0</div><div class='del'>-43GcqJTXJsBYKzHWPPDtdzy+qOEoMhTBvOM5bqSLDYSd2/2hZhrTNFNVTbRtsUF/QzWNhD06lGLI</div><div class='del'>-xmN2YmBcfgbdOEweSkUMMutoMUtTmgVnQfbB3fSQ7obYlINuzVEhKbXEq2ka6X7f9WdyDuBdJxsg</div><div class='del'>-hcECHEy2fduoHUa1JgeTsixyCbskYzk2uUxHmSokSazrkO3fHxLCsXpVQpIkMhePdU3N86Kg87Pv</div><div class='del'>-v93kGJGO4yi2YEyXvl6vKoACeSc0VdHz5sfm7rqW1jVTlicAVqRegYNgR602adn28mixl2Wlqip0</div><div class='del'>-BN20rfr9hWFIl+tVhVP8fGbKMlaOAl+D1RoOfcW2ImECxlFMh0NNURiJ5RZ5RodFUaggpGk7mpdF</div><div class='del'>-mYPPQAVONEYlZ01Cga+c/SAIrkSJdrs/vNsUNxx8z3ADq6uJoa1icuBe9CpBDIs+YHvKos0BNmBH</div><div class='del'>-M+62dic+0mwmMzaCXrws2EkGZSnonYdDLa2Ocyy24BVoodYsdds2bW/meda4KrtwoTFAJaU25eui</div><div class='del'>-hwRs1/6sHQB2AdYiosgta4z1FYPLXBReRNO0SjypylLLbDwnPlSIGgmz4BaHY+E4NXpSZSJYiNap</div><div class='del'>-KBbgkINESmrbThe2tQ536cetJ5+174BlzpOuU48GLsQfTCR41JZRUZQyass0um3fd2UpWmIRkHbn</div><div class='del'>-fszvpxY7L9iZ5Xkm68YF0jB/gygMnRQZlZlzhuJ38Xo68bNJWGDHbUfogeUAHsuypEK4GWhZLJ4G</div><div class='del'>-3Ot8YXel2MYiIfgCNwxTZU0OWxR7Pms+FdWVXPgizNKKdeYLP/M4z6iX8EeAaOPkACH8TCLetL//</div><div class='del'>-/ju9vLxIpBgvpDlY6NG0XriGG2WuOv5p205jnvIspTDk6iXPUpkBJ4bItOimxKGBRQXTURxy1tdt</div><div class='del'>-ngUDEGdctCNFntO+kWYYWP4BqgUsbNhRW9deq7C0s3lEOz8n2nh6dFFs2pGZy5LnEM04YmT88Wgk</div><div class='del'>-vgoLZ5VNmEmfztoMBH7CiZlluKN+J5vyiyonimJl16VZQTt1NAyLylez1NnNV2Wh9ufruqpZp+Nn</div><div class='del'>-HFWObMVkIGTZGDAm6iQUSMm8bs4Sjd+fA3JByy4lphuuy1GUfELgIWj7M3tykJKimAHMuqpoGDeK</div><div class='del'>-xZ0qz3NJ1x6Ut4CWBe/w58+fdDgc6HA4qPgozTKaxlHbVXcIrJ77EGK/LGEqjie9rKwSkNu3jWJX</div><div class='del'>-Ho/GmCLQMlZPwHmmnz9/6ikPkMSimPu+UyW021SopGEYeGOobd9pltIQc3dUAzbwEQBREIRUVSUd</div><div class='del'>-DgdOVF0X1iCI44yV48Kh1kYoA+gDBoFblkvOxRMq2VIZBwp82h067OjIOMnnZRVMYvUW5DT11PUd</div><div class='del'>-Xa9Xj9Jsx3Ef7x90fDl6VFa3eRj881mHm6q7rOz12VJ9N5Ro9Mm4OTkZ6KGLuCxLQcxLOp/Pn7zr</div><div class='del'>-4jii//P//St9//5NMQ8bBrIsi44T1RXKuOSwHRVPcLI08aSxSZJRnvOBZHt5/Pemab1wTLRfFmAE</div><div class='del'>-2w6tnHVb6vqBvn9PiCTvEs8Ehyy3GYkg+osahuBngsoM89YwjOQzJtKy+mKlaZqVCTlOPHHKs1fJ</div><div class='del'>-wkRQba4EtGVdVLm67zudTi9UVTUdDgea54k6AaKtRN4e9GjHqqpWleGjaQ2uwM7M6+pT1uEvGC8y</div><div class='del'>-p57n0HN5sf+LB4vMPkdbTdQqCeMoiFt2khe0OQIGSmrcnogQx/+PjYYZJ3/HnV5eTsLOi2nr7nqj</div><div class='del'>-Kqde8uND8YIDkAcqZVWxDBYv9dE0tK6RF09lfzl6sCuXY/EpaJqGDoeDSJFzCsJQwjojb6Fa4onl</div><div class='del'>-9zfNw5NwHl+OdDy+UFmy0m/fSeKsuTyHvfowjOoKzOUhfepr7cjTjuAsDXX3HKADmfowuQT+BwDI</div><div class='del'>-wOmfppleX0/05csrFaJItHNmXADADuzocppmKktHDgK2wfTWmS7i7hQEJBdGqK1dGJY0jhPVdc0+</div><div class='del'>-AuuilwZixnEQWeCLJzwgoPV0fzwU79i2jcIgVht7bb8Ef+LyP/feI96/i0DnSikwOJdv4R15btKw</div><div class='del'>-yge+48bfkzI58a7AkQkCNrAZx0mswkKP22AvXOtSNIyO/IYWcjIBrzgY4bcQ3+8Ple2CPmjlspP8</div><div class='del'>-N6DISZKKvpwU9WWaa6w3QycLQI0qTUoN3Fng+gK7JBs8sa6rKu7wq20d33oYr2okse87LfLZ9z1R</div><div class='del'>-BDxN+eQGH7vrB0WmrTIM0w2O8GLbKyjGgqBQJRximSwZqWlbdRlCUiwSaCDwsJlyXDq7LARYU2Vp</div><div class='del'>-quWok25uurj2fafr5UpFmWuqshqYxBEN46qVAwhPSLm9yThMy35ZQNzHZ5RlJbXtg1q5odHHWjJJ</div><div class='del'>-EATsE1my8Ibo/hQ+4oNYDvz1tfw44LEZ8Bxikc3O4kBkQ0fgorNtG3VLb9qw9UnItXnYCrAMGIpm</div><div class='del'>-4vqDfh5O0mVZUlWW1LStWoE75p0jDKEtRXXAaH8kbY+j3oJgY63VQPbBhcr5BuQZ0mDqsa4r3R8P</div><div class='del'>-2ve7THW4BcVkKAw4uMUd4NKOhTENox+jHoahOk9jNG15AMMwshbA+tKhX0TySdd3lOWZzjXZGuzx</div><div class='del'>-xBHgQM1QLLYs1RLltJMvBiq9hfBi21Z15F2WVVODMGXAaWZvU8x6ne7dKezKsqSqKukuIhM82Lad</div><div class='del'>-tT1Bmi9Gfj/f3lXjgEyAXPL8wJyL45hOpxMdjy+0b4JBxDFt0u7gEMDBp+GVs4u/wk3CbjGLZgEy</div><div class='del'>-7hB6M3jr9R+EgWTaH2gae1qMys4SabyWYHNAkIt7W+h+v9PhcGBXob75lMIEEA4TC6yPtm2JqPW0</div><div class='del'>-+RBoobpK4kgDO5JELhGZUbvwVaeYcyavPNZyPgfMqDx/XDwgkmPGMxW32LWFQwtVCzz53YjTgZxA</div><div class='del'>-5IuCPQSHYWDTmzCgcVxMS+ZuW8STgWPvR6/Fyhe4XK+0LDOVZSXitVFB11Auq2dDHJurYZWvmAbg</div><div class='del'>-n62JiDOlnXSK5KL5XBYhJmzTvKgXQxTKCN99CKO0iv1ZoiWQYPNYamwQBOr4AlQfY7+u7ygXBN2p</div><div class='del'>-n7hE32mnKIzo59ub9vNsKDIajr0b0VmKMkYxcFfFGKiqKuq6TpFQHDh29IMbZFlWKoqYsrygl5cX</div><div class='del'>-OhyOFIaB2j/HSaoVADYHm1wsLo9eNgfMLKuyoLyoaZlHzxAEtN8kjulyvXJvKH1zFAa0PGED+PmJ</div><div class='del'>-ADh1XVNdV+LE7KPZhQpFds/Gehg2L9kGtxhGXM9pPIqwBwENoj4DvdiOS6391DOmMU4iy4Zl1rJQ</div><div class='del'>-ludqyMIyYTeLZlAvURmxL0QjejkdaZeRbCYsUgvOPhuSRhHEQUiCGjToBJccV66haDYSEf9wG5Bm</div><div class='del'>-GbVd72VB5lmq4itMw7K8oFXYhJbotkWbVmiFjBH18JOxrt1n8CC0fhm4iGdZUzjcbPYm9pm1MnNj</div><div class='del'>-2MTsVwZ7kzSlaX7Qx/lDHLz5GcQ2ywyl0zhtZtzyORrJqrMsOMPosU9dtBZNasQxjDIWiuj946xj</div><div class='del'>-M/TjQH2xCWx8ts2Tgy6fS3W3QFFaVWVBj8fDW6TzvND5fNYbha2+3vWGYCCF0fhff/tNBS7jOOmt</div><div class='del'>-ABtmHCQWgGra1psioM1pmodyENqmpbIqneXW00J2GAxRP/QUxVy17NtG8zR6i9NOFhhoS5QdZt+p</div><div class='del'>-9SPAlIcP18Wb6GA6YYU3lvyCxYsAT7Q0ALjAVGNEvKQougquMyjXAOuGXY5n2Yyh+ik6diE7LB2P</div><div class='del'>-B6qqg1fa80a9Gusxd2vDGCPPMrpuNy+OGy0LvAiAJaVpRuu2qxYCLVYYsiGtbV83aRmxJmy68az5</div><div class='del'>-h0w/tjoNJuMsyq8AGOrckzfvGSsHQSjQVjNjMQmbRA3qMLCENE1op53GoRfODnshHg4HbgGArEOj</div><div class='del'>-z4y0XsEdINvPiiwk0GCOjLEOIsMxorBiBSwwlIcMeMUUBAzURWHE6cTSR80zM98Oh8Mn+2nwmrlc</div><div class='del'>-T8UHcNGbgogoF89C9L3IJ+DcuEzn85aLD4sv0JXZRCM2oNb0yZ7KVkJMmR6oKBI9FOEspOEgL0TH</div><div class='del'>-w5FSER75FF3XLyPXD4ku88I5gJbK+mljy4u/y8+1hpqWf992vlmGPUDtXB4tEOLabGCGFXrhz9oJ</div><div class='del'>-wPl8Nhs6UWfmYeA8xmVZqa4PVBY5ZXmhh8xDQDuOSmv49g4CyotSN8q+D588LJ2eRSTRYlKC7wHc</div><div class='del'>-YFlcXBgOEBuTZnMo9t2ZlvBkizUN+Fncpq4ajwcW7SJKSJf8tKnoDKnPDmid1JnY4hqh2W/AkIqi</div><div class='del'>-pL7vtN3atthcCIkn18cB9Hg8lAF6OByoqkqKYXcH5pSlQt7vD8pEj2+jquwiRYmyKCNw1ROLU0p3</div><div class='del'>-ORyc/DfwEFCXvxbHMQXECD6TJmaa50HHh9bFh5FfFzaZQX8g5ZP1JLhcr8KmWtRfvyoLojwXbfqm</div><div class='del'>-PTsbfKZqWR0EAX379pWWZaG6/kLjcFcpMFEoICGpHmIyPIayZEPTMAzpcrnq3+0wj43iJFYHInsL</div><div class='del'>-WLYZJgJqQybvZxydlxyio60jLNx0gyD0WjVMWDaRsgYBefRce/sCT3BuTJnacAOgA6kEQhuLmHMv</div><div class='del'>-7SSzECJtst7GcZRcP2YSrsuik4/D4cDjSvFuWBa2PR9Mn2uRc1wy9iCwrSJEY3YCYinQAHXBEMUt</div><div class='del'>-/9xeWJ69TW1iZyeeRAFsxTpnPkwp4buBGU/7BqsWI8P3G8ZVR9xwE2bPST7MIMNWz0f5XzsV4e/F</div><div class='del'>-QbvWkux65Si1uChKmqabd3IeDrXEW9d0vV692xf8ZqSyYgpgT02AOJawYckabla7Kz+6l1sCYx2U</div><div class='del'>-UcgTiMKIpnliMY25eS311rYO6IUsZRS32jSzX7z1QRjGkTaT/oNxUt/1RDTz4SDEFBsTHkWhLmhO</div><div class='del'>-nXEtRLgFtCwzHY8HPcS6vtcTHCM7WEut624qHB75pWJT/scfP+h4rEVKnAqwx3bbuHUgqx0nhyyz</div><div class='del'>-x6FTiKFCwvvADe/Hu6fKZ7BjUsdTCDzlJbghyPxDBZGmGc0ilGLzWUddZmv3WME/Ta6VEebhcKAg</div><div class='del'>-jJWJiug44B/2wLRtihspj/qcnEM0eQeDOyxICU92fm5BcRCoLOiM5+aPCDNtefadqOt6ejwanVZZ</div><div class='del'>-FiMqHhtZbpmYMNwBRZ2IaJ4mut8fahy677uQgkiNci6XCy3LSi/CL4GtOcamODSLoqR4390tiEVa</div><div class='del'>-VZWUM6OW9IjucsQRvtFghBlHES3rSlnKpddzyR4GAS1PjDQXLpqowMb63sWinurFXgw9vAUmHQKb</div><div class='del'>-eOyoICC6Xnl8ZEEyK2JClDTAONt/60sfB/r4ePcimcFR4E0/eGlDFhmHeKqqqiewzAKLbj5u5/pd</div><div class='del'>-11NZEk3zTOEwUFHkVNcHlSPHkjeA8i4ShSH6b8tJgLwWbR7iy6ZxFHceFh1hpoxyeBxXD5Tb952m</div><div class='del'>-eaGua7Uys+w7TUaWf49Al34YtE2x5qiYHtgDhcEtxjsej7v+/dO8UJaltO+Lp3vHxrYpS2AiwlAF</div><div class='del'>-Gw3PHBMutHNg0eHPgyi0LLNOV6xHhPVuUA8IqU4sxsAj7uETtf0iNFyujCPBXBbT/s3aVttAXR5B</div><div class='del'>-rgafcD4Hl8tZNjq7FdV1omsLvz8gZ86jrNz//I//ojRL9cOgpIX/P/cqEa3bYkofSfSR3ngYNm9T</div><div class='del'>-gi/gSYrlFH5GjkErhlVREHJpDjMNa5zw3Cc/TwMsWAPTRqLJyDhZ/ZfEEbXd5L1IbCzEVmNDo3zy</div><div class='del'>-DTvJAzntC8Ehpmq1LOMQ0zBQ15gsy3T0Bd86bBoAskgdgq9+XddUVQcVDjnvQDdeRGAK2qimaeh2</div><div class='del'>-u2tVggWPDYt0Y9jCwbUXxhnc58ZPphKRUJ2N2YbhJAA4AxjWNC2t66ImKBYQ5ViyQUdWEALBaszm</div><div class='del'>-FHLbMn1yiLKb344zbTDLs7W4c6xCHL0TYvH7nzUkNo65dMdnK/KcWgGfgXvgtkfJ70xIIs03YPdj</div><div class='del'>-h12hXQTd167tHz9+Upom9PpaihhqMhkKibYbMGaFaApeE1vB1vSHQ61/N2siFsPQZF1G8L//9//c</div><div class='del'>-Uc4v80zDOHg9BPeyEfVDr7pt9PtQG6G3+L9FX+HG5EARUHwDBXyiiN1awzBSLjN03TjlsanYwTX8</div><div class='del'>-FJxp9fxEboFAZ81mi4GqoJxuPKQiLyiMIjUTxW1VFLmIPZzO2nIQwJo71AdaxbsAFQ0y7J+foQv5</div><div class='del'>-RK7gqOBhFAY0GSk1rL2GcdKF1Ha+A8/z8+XZdkGtxG1DKu209pHq2XmzoHVbqMgZB0HUNvwA8XuB</div><div class='del'>-2MNXARp5X1MvClJRqWlVKRLv6+1Gy7LQ4XCQvMORoihWTMK3fMMhH3qfHeIj56AUyAE+iKcCVwt8</div><div class='del'>-wPZeBQOgD6AwKwd72tadXr+cfFNg4wAAIABJREFUtDJhjCUxh88oB3eqAi42rQ2FkOYYkTwJiWkc</div><div class='del'>-Jx07g4I9ClOPqcQpXa5XXftEDAj2fU/H45GOxyMt80I/335SURR0PBz082Mtwfu/yHMetw6DXjTQ</div><div class='del'>-pAQU0CD6A7ynLOUxfHC9/rbzTDhUR1Jrqdy2Lb2+vnpaY4w14ohPIKCfzrfcvZzL5Upfv35RR16r</div><div class='del'>-94f3Gs9WmaCAvgsLgPPdvwn1k11mYcKICgEMszRNdTzFoaEjXa83+utf/6LEERvZ7URHpA7CTjLJ</div><div class='del'>-KsmPjw96Ob2IocTsudMi0ATjqkXn847Jd71e9flZTTyQ9XXdRLLM9GnccvaARFqxteC2ikRL/rH9</div><div class='del'>-7bZt9PHxQf/yL//8FCWWKFZj7drxc8C8y/Ocrter6PkXRZizlA+lZ7q4jYgDsWYcRjocOA14mSe6</div><div class='del'>-3e9SFR0ku7Hx9Cb2AICsFvbrim4bVyC0K89W5CjV398/6Pv3b58cpqwDERSex+ORpmnUGK4kien9</div><div class='del'>-/YNeXl68KghzeOt9uSwLVWVB67arurLrWur7gf72t7+yBiBNtT3G50D7neeZ4l+4vcMwob///T8p</div><div class='del'>-TVN6fT1Rntc0Dq2XVI22CjF5wLWwNrB+0HrhUtI2ezGmgX8W8ogYL2uhFEpAJm4fFr5MCijZ/t+W</div><div class='del'>-YPjv6NGDIKSyzETw0CtHGbxlB4bFGlcOA8k4ThSVRw/HmgZuP1LRk6s4x3i14wbAYmvbRok6jnS0</div><div class='del'>-6k2PHEGUp9a8U/UMBtu4Xm+eYalz/42EUryqFTYTUcZP7RFGQ3Y8a7n3znjCf28YVcZxTD9/vum8</div><div class='del'>-OstSTzZt26f4iebs3k9gpkCOM4/Fb3PqbOQ2V4Q5lUUhaTQLjdNd6eHbtnFOoIxcoU5LEt4IaD/h</div><div class='del'>-XKTsTEn3hUsvfPfQQizLSnmeGEk3UndjejStmtsCI0Hluq4r1VVJYZhQHC3eyNpKqJPYGZdYVisO</div><div class='del'>-z9msGd4vm7I+r9ebJ5+38lzGu3i0u20bVVUlNPaGbrcb/e1vf5PPOdPlevWi2q3pK/NwEgWp8Wyf</div><div class='del'>-nb7R8u47UYzACyugsH/AUUI/9952ZvlsZYy+ahI67zxPuuGdFJetmGc5rZ8XOv8dibIP4UNvc+xB</div><div class='del'>-c83gP1jwuAk88iAglb3aXD6L3qK3ShNOh7WEinGaqCxzk1w8GyLLqA8zjhOVsuKf+VncVeuAeGuX</div><div class='del'>-K+DrwwEQWp6B671jb5KCEty+CzviYv7+gcYxpaosqGk7baWgJEQFgPeGv5P/PEtVM9GCANMJJBIN</div><div class='del'>-iDvoyPvuwjlwGHZ9LxHetQeiQt/P2vtdD3/Wb4xKIc9SkSHLRGgTOq497IAl2EhxuAXjUJilTEbQ</div><div class='del'>-J6PznTMU2TZq2o7yfNUNjTVs21oO6CDFq6BezGWs7KqwWEd3WGPPFZoKkwx/AdbfaOkwieK4+kiD</div><div class='del'>-XG2VhJ9h8wJ4vzmMKo5jxaaAbQFgj7H5izzXcYzlE/PJsijDix1MQ8qyXDc1HgL72Tl98rNkM0ki</div><div class='del'>-DbgIlezCi+9Q15SkKf38+VNMPzMNrcDGQB+GDEPLCrRU5ChiZLUoCr5daP9To1CuSEhSWZDWOhmz</div><div class='del'>-ylTZa1kK0Gr0sv5A8bQbG1z1JGGtexRG+nmjMKBhXPXADcOIpnlUKTNKROX3h5Z8Rd53t4nO27bR</div><div class='del'>-7XbVeLUgCOjleKDrbZcw0Men719XlQJawDhsWTtOE23mgGmahi4XvnGzLBOW5CbMzkTJLPj89vYE</div><div class='del'>-Y47fD6+fKAyoaXqn4ZCpkoLD267qQVSZaDF8c5OI9i2g1QiT2rYTYBVZA7xJy7KibduNOYh7N/B8</div><div class='del'>-eHZmtll8qEC3fRc+hlPqDcOolSXo7kGw0jIvTz4XRMtijFyWhR6z02wgD2FZdmOiMyuIiwwPyNkx</div><div class='del'>-8rYVm1WnPrd6XdfR4/6goswp/vL6ymypNKW1abQUwwwVABgefF3XKsGF/591Ju06jtK2HxaUWNcf</div><div class='del'>-jp6QKM9z6oeBmrZVB5R13eh2v6vJ4v3xkEqFo5wgsHgGiywPIBWVXUCBZ4pgS22g7mw1NQnbLTIm</div><div class='del'>-IbNHj8VNaQkvm2S5T9Oko7RpXqjrB/rx44eSSzB+QfnOzL5RbpuN/vj4QWVVugBLUUTWRuGGPtm6</div><div class='del'>-x6CUzbJcVX7jONEshI84jhR7SKQ8t2V+lqUclilTCYwuq6rU3t+BjZkGp3DWPY8nWSG6ebcaDgOb</div><div class='del'>-6YjFiT8L8RZATqtBeQ5JsUo9EG4ADLsenehyuXr6DbQ4TDC7SUI1E5SemYGW7QmzU0zF7Awfwp00</div><div class='del'>-DZ8qkljbPahY0erZMbb1bZhnNmXBeL1pWu9ZLMtCI2jIZiqGdguf345+wX6cppHmOfcSsIKA6HA8</div><div class='del'>-MB8EdNTp8dAHDORy30kYXYOGdzB1eFXutDWNqKpSwQ7ndU86OoGtMT4gjEXyLKVOT1pGx7OkoFRe</div><div class='del'>-8jCMetAgdxCeeqPc4taIAuQcjCxRsj7bgS3L+icTi0gByUxcZaCkmk3OHghMIGhwWkzGTEMTdJnn</div><div class='del'>-hSz0jMYxMJ57jD2AQ7DvO6VZSl3b0ddvXw3Is3lKTRCesjRVQhbKWICJSZrqAsXYLgoDmmdnuAGp</div><div class='del'>-NDaQUy+uHIldV9piWJIYx39V6lMYhiGVRc6W6CbPDiWsLX2de02i3vRxnFAYhbStm1agFodCBWSl</div><div class='del'>-xsCKnvt0l1MR6cju9sSz53fvrN93E8P2PG6eZ0bkQRLChgSYyvLxRLgFjqWIdi0UFqIFVqFG9UG8</div><div class='del'>-RMfFRcEuVhaHsJs9oFjBcl5HgQfg4rtaPQ4mQeAsoKLN8oJi8LXxcBxXmU/waZ4pldub+7pB0O/O</div><div class='del'>-e1hYDEEQ0Cr5b9fbnemu2+opCJ2LbKiKP3uTsyCDZae//fY7/eUv3+h0OlEtuXM/39505omeHKXQ</div><div class='del'>-c5KspXsCRbb0ZjvPxcm+RpuqFu2N5Fucr9L+sLgCCy5OOGV2mltpJWKRHSdykE1edWVBoePxSPM8</div><div class='del'>-08vLKy3zSDcx3rD4SBzH9Hg8TERV5hFxur4n6nuv2nHJQ6tuEOQYnk4vlGWZUqgRplqUR9q2+VPF</div><div class='del'>-hMkExoPzPNMoVGhLB7csOugQLPKOtOIgIPrx44coSDfloyhbTsDR/YnjYct/HGC2J87ShGIRHmGG</div><div class='del'>-bpF8XDxsmjF5JC4ckGyAk6qGBL/OH2et1JaFD7u7TDfsRCaKInp7e6O//OUvOjlTebcp1zkct6I8</div><div class='del'>-S4nI187Y5KlWQHCAxFADguGpTlXm2bNGITMSbF5D277T4/Gg+M9UaFzGF15wJ060WVJxLPCHzVJX</div><div class='del'>-FWe7S8ACf9hAGUhA7HHyz3OnsmFnhLh7G7euK3p95SSadZnpLA4ySeLYic+RzZv5jHbkw5sxp7u4</div><div class='del'>-C6NEdDbRkbodzfNC48ToKlDz55EbQEqmsPZ0uZyV8IJSCyUmlGNAiLlfntVs83x+UJYJjXgeKYxi</div><div class='del'>-vf0x+nrOa3g5Msc+lQ1sLd3wTJxOfvdMK+ZlVTlsWRR6gADNH4ZGbyJbgtseX63TolgPTeYjLNp3</div><div class='del'>-4nDFyPNwONDlclZuAjZ+kpBKlCHhhevP7XaT5NzC8EEGHb09x9GN40ht11Pb9TpFieOIzueL4kvz</div><div class='del'>-PFMrAKSdellefpLEVOQFpUlK/epk6ofjQd2xGRjcNdcBgDUOPaT3WBeeRTz9JtMOBEGgMmRfq0B+</div><div class='del'>-cG/bqsLU3vwgFWEyAno52rJ5WbW1wXi8rkuKyyL35J/YFGVR0DS7P9A0s46f8OIReoi0nk3ah/P5</div><div class='del'>-orNrRnGdGy425jjN3uYFicZaWQGlZYluQl3/cKw32UDYJM8P1NqD42e9v7/r54de3AIkuHWswaRF</div><div class='del'>-aZ3sefEkmUREx+OB5rnwXF05y+/mWXbBkzBNE4mCDmjfNnNwMKDphFATe7qZWxAtRRxFdL3d6SFO</div><div class='del'>-vaAHA/EFcHW73eR9hPr954U9Bg51RXFSUJoOSr9GBqI94HGr2LEXwEc1qxThiv3vMG1BLDkYjmhl</div><div class='del'>-tm2jl5cXsQNjGjmj6pFyN7Duipzdl13oBk8BoC/ArY3LC8xFrInD4UC321VDZ4IgURwBTlTLsn6q</div><div class='del'>-VOCWhCp2XVdW1CUZRdGgNzXMRJ3lN+NSnEdZ0zyPhnPCFxi8/myLgT/PeMLiWe6B6m3zFTDpUnMe</div><div class='del'>-KfctM9bZ3ieCVTHLMM6LksaJFylLL/mk/e3337TEQEmC01fniQZouVwuKkApioLquqJlWalpWgmF</div><div class='del'>-jHX0Za2J8OVC4zjr22CH9Gga7Q9dEMksXmuJHihAOPn0TilNA6LdCUcQ+nmoK5qXVeiZIc1zoGVe</div><div class='del'>-aOzAYYuNHs56sD0Hn+57qkEnnEDLfm/TNFPbtlSWpUdjHYZRHWLiOKFoWVnJZyTEvAH5u9lQ0Xl2</div><div class='del'>-OnZUMAAyrZYBCwhzb4Sl4vlCznq93XUzwt/fsi0di85VQM8HLvj1zj1n0moKBw9GhIdDra67bftg</div><div class='del'>-3cE0U5L4FSBjLqTtVSrYjP27mral+/0muY+x9sr7TpI/2WubGYYhHY8vdDy+0LYuNM1MC7c6DNu2</div><div class='del'>-rOtG/dBTLpUS1iys087nd71t3QYe1CEaZDd2MUqIOTcPAYknFYW5qnM2OYqBmuJycvOm75q1CpzP</div><div class='del'>-gPW4rptGk4GvgurT4l5cAfFBUtcHillM4qyS8LC7LlHBArLXqqqmZZ4UuV5Xl3IKameepUK3jbT0</div><div class='del'>-fzautKorINdAM3Gzv3/ctNQBCQRknsejMXr1QF5i6CHkUG/dHw/a9tVTwRVlTdQ16gEAHjyMN1nd</div><div class='del'>-luttiSrGmqNYRRrSWGfhgaMsZmJKJr5zhUY4Wzk1FHx8szgsBhsIcVvbttHbzzcqypzKsvKANetS</div><div class='del'>-bDXlibEfY3DzqLc1+l1rMZUmMafzJgntu6tuAHbisN+2TceD2OxYsLjhbJDmbDQHkMxaPX3fd9Q0</div><div class='del'>-HZ1OLxL5HYt5hfNmaNqWoqdAF1Rvx+OLTlaCMKSAAiUZsZ+ePwKe55GyzGUaoA216Dp+b98PVNez</div><div class='del'>-SbMOdCScpSk1piXDBWRxqaqqtLobhlFve9zYaLsCCigMZw/byASzmqZRvSO5wpvUdr8ocvXPVEu3</div><div class='del'>-OJL8hVmNbXGgn88XHgHXXJHE1i6blUQZpVlGQcCGinG8UJZyeQ+qsKVC2sWaZynFSUnDOClYaH8B</div><div class='del'>-qXcediERsaY8TlIahruKKbBhl9mN4dIkplVuJxtEast1tB1YuKzIyqmqSr15r9eLWn7j5+D2xBwf</div><div class='del'>-6sKu68XsJBPwKFEWpANxOEw1Eedg9KE6KhSlZBQGtJmQSXtbA0fB3wPOhZ1H50Wu0muU+ejrrFIR</div><div class='del'>-G8RGVi/LKvHTmVqlO5s0wXhkRm/BUVexDFp6WuDWEltgYuH35Bt9vH9QWZXahgC4jGPmFvBtxKGj</div><div class='del'>-SRzr52aDi/apolm9cBBsyDQriGij+/2hmgjIaS3TkAlcHOJifxaqPDhFuZY49KTR+87chKFpNQQE</div><div class='del'>-z3NeVi9u/rlNxMibvf0mul459i0KI2W1ooJBrgNXcKX4ZnbKU4GxTZ6XtG9sZw5wnSvQ2Sf1CTkK</div><div class='del'>-7VSa8LOM7UwSHG42oeCF3ncdhWFNaRJTOwzad1nZJA6Crh9oE+DIctKfNycMQFGy9MNAJLFbAIyy</div><div class='del'>-LGdmnjEVBdUSVN9AXqY1M8HvY81BRUmc0On0Stu6eAva6haso00UJRrZBYqlzaJ7PB50udzo9fVF</div><div class='del'>-gSwQlkah70IyDUzFKsSAh9hEGfeiYvPyJ201YEtWVRVPQsQw02bbWxqzM5OcvYMG7U23bcpxwAJB</div><div class='del'>-u4J3aw84xErneaYzZ/uOtcSUmwh8BXx+PrhY7zFIpiK/4y9ejHsSx5TllaQsufeKVqlpW33/9u8f</div><div class='del'>-xkkXvJ2uwNTU8kVcCb+baO7QgN2xV7EiZSlNUq1skC6MFhGAn2VTgikI0BezfbBJ53mmL1++0On0</div><div class='del'>-QknKBChUNfhszzyIzISOam7F2Hu5f6hA7MQDTshYj6kcmE3zoBjKPCvssJziaZ4pk54YAFaepbTt</div><div class='del'>-uyb0WNqq3Yhc1vogxjg5yiZuArDMAAyhZOKxY0epsQ23Udno1VHyw2oc5qKQPM7zqGPKZwELXFMt</div><div class='del'>-t98FfWxebwj67Zcvr3QQemsjqKzln+/SFs3zTHEUq804LKQtB9+Kr+xhiY04TZNEj3EZ2na9Jt+g</div><div class='del'>-/bAecjCStLLf5wMZ3x2BrDZRyaLpduKBhftsDmoP0EfjIuFxC2ZpSmVVUV0fNB4bybh9PwjZiMeH</div><div class='del'>-DxEG2QgvZAPy4dvQ4VBrOc63diubNPO48W6s5yTfWZbqd7BVBaom9S2MI+r6WZ2ueMMuT8k67lC1</div><div class='del'>-uBEOvdv9oXiN5UDgWUIAlGWlRoDZz41n+vb2oSEpVwlqFTdflc4PIiBzhqiBF9b6bOjD7sZsix6j</div><div class='del'>-lLOjBqtoc1ZXIT0eiGXipNKP84eWjUTxJ9dY3CxlWaqvnY29gp1Uon27z36K88zjN0OYZC2sYeoB</div><div class='del'>-22WLogKYwfzU3kqWPAJN9rOqzi380Qsw4Zw2jn62Jfq277TK98ONBNkxj4EyfSmuCog8x2MrbrGU</div><div class='del'>-VhY8RTq+ZForcyHSrKDH4y7fcfEYjmq5JuMntGu+mMkdAE3TeNiLnaLAtAUH3vPY1s7r9ZCV38OC</div><div class='del'>-q8RT+hVFTlmWayDKvm/qI4DvjyqMiOjr169UlQWFcqg6DwG2cGeZLvMzYPHFfg6rEp7sAWbfsTWN</div><div class='del'>-WbedyiKnKY5Vrm1JRnZUCBs2Vw2FmnLV972hsu/eCBcGnaBzW4GRnT5VVUFfvrxKmlPDIaXbRjdZ</div><div class='del'>-07x2ZvVntGNB29ZaU1f8vn3fKfj3f/9/d7tx7cw3FLtviG2ut5uaemJxBgGJq04hC3xRFRfIItAf</div><div class='del'>-R1GoKjjLhLIe+GzQaUUYgWao//jjB72cTlRVlQI4uMHiOFHWGHT2WZZJf9UTUaA68s+eBYGWgnyD</div><div class='del'>-BXIqx4Z+G3l6ajL6AhxQ1idh21Z17kG8WZZl+sysRZXrN2NBuEM1jYS2nFuSVRiObt4chpFKQdMk</div><div class='del'>-pbZzYZnI+MN3hyEEpwFFNAwua36XcR407Ha6YDfMIunDaOGs/h6XAbcCiwacwNYKzxWbUBmKhm6M</div><div class='del'>-nwFjmqZp9fDMcx7vLfNM4zTq2liWhcqylIPe4kOboucMRs5eGMk4jjKhqYQMNevzhFEu3jdjLrGO</div><div class='del'>-Nnken3r8GWBB7qBwBwuCW5+9NRljspcTee5BcRxRVZYUJzndbmcqi5LCKKDb7a7rzrFgI90ruFSm</div><div class='del'>-aXbKv9glC8G7Ifj113/fIdN8TvolIrpcLvTlyxeKolBBpKIoVc6JGxkGC2AI4qa9Xq/07Rvnqz8e</div><div class='del'>-Dz0dYcbgypKJ47bKUllL27bR+Xym0+lEQRDQ+Xym4/FIr6+vqiN3kdKJGB+MnhHk+8eFXl9PHksM</div><div class='del'>-bEf4GNge7tkI8uPjg+pakFwBqKwJiWenLQpHRdjHkbquo7/97a+0w9BTKgObHPOMl3C/x9pxfn5f</div><div class='del'>-lcCEXxgrAYXHiMqSoTiKjIM/fYIQSYzaoJMRtEi4PaD1uF6vwv0PlCRm+Qzcd/pluEWdf/vtd3p9</div><div class='del'>-fVXQ1YpnULEBVFXbMeN7//PnG/3lL9917LjvO/3xxw86HGqq61q9ALHpt23TidG2bdQ8HvT161eN</div><div class='del'>-oge4CL5E23b0/fs3Korc+OVFqnK8Xm/0/fs3D1vBZ8YzR1WG6s3exOfzmf75n/6mVvGImEOLDRfu</div><div class='del'>-sixoWfx9uO873aTst2vStjqwCs+ynF2C910BP/aDONP3798U+wCXQr0b2cW21EVhbZh2b9Qza4nI</div><div class='del'>-Wee5fnkXOlkqBx8v0aHxkXAABkUln9F7fHkAFpauSyRyziKnMEw8vCGREeI//vErvbwcqSgKncNi</div><div class='del'>-zGONLc/nC9V1SWn64hGg7KiR8wI+aJpGp8+WktSyB11O4ua5F+OfU9EuXB4PtQ+zTrT4TCAluZbC</div><div class='del'>-PgNSQ0rrAGR15Tagwv67+/0uY8BYOepN03qtS9/P3ndZxH4cd4G9jVB58Kw90pucJasBvX+ctapA</div><div class='del'>-fDrIWn//+y/0ejrR129fNdHmeVIE+ioTnZiNl0i4BrgeLy9HqqpKPSIw+gpCvqTAEGUPQwZxATbi</div><div class='del'>-cFoWXj9fv36h0+mk3pOBxsxtytFPUTGJ8atNLE4MO/J6vevBhICbeV5oEuKP8vnlkEmSRDgMBZ1e</div><div class='del'>-TrRuzJthKjNfAAjpseAkTETQpmF0CpLUYFijTBdnj8VFzG9ddTBSjOSTZV1lbr+YkyXyNiGALXt6</div><div class='del'>-ObnvSn3fUVWWNMptjnhoeOWjl4WgAgvL4wjEsTrj2MMB6Oe67XS/X7yHwWwqLrOPx4NYfg0eGAmO</div><div class='del'>-N6cHlVRVNZVlJf3n7s3EUQIfDjVNU0qvpxNN82Ty+py5pg1VccEni3IS5mWh6+2uiDLKUAuUgdxh</div><div class='del'>-xUlt12u5bEvHyfgaWDooblSYWaIKw0gzy1IVVVlWG4BYkEdQlQGfgGkqemgEu2J23fW9jtoSIUKF</div><div class='del'>-oYuXz/NMq6fv37/R6+srHY+vdL1+KKaDw89uvtmwU6F1d8BgqmsGz6LrB6+qeh5j2jwJVGgYOxKF</div><div class='del'>-tIvuwbUJiY5HufKYNXkJxpvP7k1lWXDMeFlqC7ptu/osYi0DEM7SVPkmYRSKZd5Mh7qmnZimfH80</div><div class='del'>-9D13eZLLQkrk4fcVqJLSHv54lsPQU9t2niU6S/cXVCQ8o4aWOZIsc/izaa9gEGSM4FzMkkOCp3nS</div><div class='del'>-TZGlCfWit86yXHnm+05emW/FPIOwvOxt9vb2psYIll8OMhDmq0FAVJYHZ/P9JJ20iarcv4WekYal</div><div class='del'>-ECdxRKfTC/fEaSE5e74MGBMNu7ieNzb7EPKIL01cfl1R5Fr6ohTGz2jbht7ePuj7969aRdk2AUo1</div><div class='del'>-LFLYZmHECI5GEsNaPVVffAsMwmFH8xyj2COxLMLEAwqN6ZBNRLKpO8M4cpLP4ag5djAV7fqeTqeT</div><div class='del'>-kFtSfXeoSpYlNO69kaEcs+9BnmdC4d0U/bc2XM9GoTbS3bIV7eZwY+PHp8kGRmo3YUliTWYZawBC</div><div class='del'>-eVa25YI+wEqRJwkn4Qsw9eLqpnkSnCqgbd2o7XrlCQALyLKUysLlFNzvdyXmcUDMoGNq247i0mua</div><div class='del'>-htI0lTWffbKai/O8pJ8/f+jsHZs+CAI2tZDeHcgwgw5u/l0UuSdYwIFgFWjolfp+4BjjdaVtIwVb</div><div class='del'>-XEILtyGb9LXn80VkwKDYxt6MEyUp05fZ13DoG6Uew+DRvlT06X0/eDJYp6iK1MaKU1Ua9cKDOSQb</div><div class='del'>-jey6CS1KbmfoGA2qVFN8AfkwzKUn9XPu+IbI6XR6oS9fvtD7+4eU8ZnOtXGgYgwIWTV/9sGEg+6a</div><div class='del'>-DIM/a6WoYRhRHLrE22eXZUjD88w5Mlk6KjzsIPBidmDuouFFjm1DTPthoEfzi7Y9yDZYV9dTszmq</div><div class='del'>-m7mjciyLXEBkF76SpCmNQ0+jSflJ4kis0PzqrO87TU4GVmFLZxfCkSsL0V4yqMTshrMHB4fp9jRe</div><div class='del'>-r7I3Cg1+5cM61vBT3kuk5jWjTNvshYwxKqs8B3XPxt/XmkkAWjc7ZWGNylGp+drai+3Yoa4o3jcX</div><div class='del'>-eng4HBRI0/GBQX0R/vA8KdgEebRCGJRlYPXxghmo7XrxulufmGo+9sAHUkpZltLXr1+ZyprXtO83</div><div class='del'>-vfHwEh+Ph24+lPrOGYXBDsR/o+R1c303ejmfz+oZB00BEGwcEGqpPY0eG9FWGja0YjOfMRV/gXVd</div><div class='del'>-6Xw+s3dCFunGBc02iiIB/moqik5vj+dKIFFPeRL0O6M4HvU53MSBF+0T4tjQ+1vqclmWVBa5LjTL</div><div class='del'>-CUCmnTtUZ81q2DbrDUEmoXfWDeaoyRFtu0+1xWjueV6tkwdlj/r2dLxRFhqbSTeUbVvB/cfF5WTd</div><div class='del'>-bGbTSvu6rIsXoYbSGoKaRRKLrGrV+hJY0ByVLycuFTptgf6e3ZPJu6k5A6JTS3F+j4boI99L2bZ5</div><div class='del'>-zpOLwmVRBAEp5mUrRK44YEOeEdFGTdNqgAkRUdy0nQaBZBlbEeFWnJdQNzWPYbgEhyXSvpNyu7ll</div><div class='del'>-SP7UFhzCiqIoVOFl46XtL9wW4zhpRFRVVTSOA63rzOWSWFelCRN9wB9I00QNPLHowOirqloXnuUD</div><div class='del'>-uLLaZys6FyTDIgsDGmUhlWWli3qQReymKe4gwmZDpYJFxfTiUBeXsinl4GHzlItz5xEn5X4Y1JwS</div><div class='del'>-txLMQ3/77VfdzOq01Pu8Aoz5rOlEkqTMyjQJuu5wDD01GZKY3UEbUZalHN/Vdfr7bWp0fTh47ss4</div><div class='del'>-TLFUbDTdsiw0S+la17WWvrOkOdlJFYd7DvpssYFddZFp2c9+Cy9UFDlFcUJRNHmViXMA4mczjiMd</div><div class='del'>-j0dti9iRulXxja0q3Y1uqLZpoocJREtFUXqaA0fISnSyAhIPKsJxHKnrB9r3je73Vh25AIjatWwr</div><div class='del'>-WHhO6KRpWyQEJvBwphj215gB+84poT6UYRh1pgi3G7Cinum+z1lzAOnSNPMSVNgfb/IeJjThKC2n</div><div class='del'>-aab7/a48fizwJGE64yBppwiYBKnHqp9AOsH4cpSRputnF01EIiL+OfOiggxLybR+d0z+CbXNgUrN</div><div class='del'>-ft9pmtR9BrgH+v5UTnrQqcGTRxkLy7Vt26gfBiqkP+z6gZqmobIsqK4qCYmIVD+Pfn3bNjoeDnLI</div><div class='del'>-bNq3Q7f+HIgyTrNyOVDWJybzYVCZcurbdIl3oevVc12YzDqbNJHHLlIrabU2XLi53RTBxz/wOYCk</div><div class='del'>-53nmefIx94HX17qstMarp4mIo1kUnJtnU4aLwFZz87LoJAb8E57bO40EgMFWEHyMFB+Ph2YjctKS</div><div class='del'>-W3OomC3jkttYoih07RWIWVVVKeaT5xmFsoca4ZWgesShgMuGzWgYswNPgttfXqsxynx7EqrkNww8</div><div class='del'>-zznf5JNvhevlSseXAx0PR20ZbP4fSqXUKJtgwrk/AYCWAQU0H6CUPbk0mnt2yOq2cwQyPnuR5/T2</div><div class='del'>-/kb3+52+ffvGnn/TpASPbVuJyJf1ogybplFtwcZpEpxj/1NP+VRUcuM4UV3X2vvxLR952gN7uO47</div><div class='del'>-aaoL97n+QbM9CXKsuAfejIy4RzTPg3IB0oTps/vW07rynymrUm3ZbLURRaycQ5u2yiRIS+pl1RYG</div><div class='del'>-VHDb4jgLKtL+FIdxJ20vxTDQAAAgAElEQVRJmiZqeoIwWBzoOLB6cTBiTkJsIr6dAg+HNP+zLway</div><div class='del'>-/A0LUI7T7FHJnSMxWJLpp1IerUuec4T2NI26WfWmlooLzsKwlC8rngDgmSKbEs8OlnpN23nMPKwP</div><div class='del'>-XLD/+V9/pzRN6OXlhXv1w8Gb1CVpSrfbjeZl1SRtu09sqCvHii+0rp0qUK0GJU6TVIUIdhyHUhSn</div><div class='del'>-sL3p7aZha6RUFU4QSji02Uknd3KBncw8m0UrnSnIhl4LJSb3Mi4WGv29M01wiadBECg+gPSVNM3o</div><div class='del'>-UFe0bruCPfhvlh9g+28nS2YtgwItoc2940nAuq1K8uGTOKI0ccw89GN2mvIsjcYzBcJrLdqsIatV</div><div class='del'>-r4GIs9Oull4YWU3zwxzWfn4eDjIwBVF+owdmwCr2jEDA6YCS0LoXW/086xJCGmRcaE011bQ0TWk/</div><div class='del'>-HMSLv9J3AiCTLb5WLfu5FD94IC6X2rlGXmGaYgU/zzoIKATxbDXOzPhA2A2kwTXzqpMcG+pZFo46</div><div class='del'>-jLaWQ0xTCqNYHYVQ2SnF3bxDtAi+m/BKVVVQWVZ0ONSslhTeB3gKFoQ8X660bZuk/8ZGHr/rQfnc</div><div class='del'>-lmP9hmFI8TRPlKYJNSJvdKSPWHPMLWnFzmfZCkncaZKMfv3td2EKFk/ZbZHHDQgC8kIUAPJgfIO+</div><div class='del'>-qOtaatuODoeDdwPbcQ02Pl4e/AvyLKNGvNnzoqRxHGgYFk8E4ma+sfegmqah0TDr9ObXOT9LYymO</div><div class='del'>-aRTJMfp3nOJZllO/DtQL264oMo9/b2W8SvkUABKcAAfgcTkbhdxCIGGJNyinvF4uZ4+rDtSbc+MS</div><div class='del'>-VS7ag9byxsdxoLKsFOEHFdf6FzgX2+WTmxMswtB6WFPTeV70ZgURpapKSrNCDVSyjH0T1mXx0ngx</div><div class='del'>-igTOUBQ5zfMis+9VZ+O4oHBA4JbD5wGzEN/Boeb0KS9CjU23jYZxoDIqPdPNcdpUnAWpOtYJG8F0</div><div class='del'>-ymzlVqAxwi8/eCQ0akrEwJclYz5RxBVp1/caP2a9NKy6DzF2NreCKffhJz8OG8Yas4fbatDV2DPQ</div><div class='del'>-zIXv7CyWIw1vwAcBPgCABKQT5sfPCvygLLHiI8RE53kuCKULT1zXjOZ51QkC2hH4zgGHuN1uLu5Y</div><div class='del'>-Dq4kTSkSrjrGYLZ6sVMH9Ob4edqHpr40FvFnz8oubOCuW3WMhxgzzhgsPFEN2F1AladppG1LFBiL</div><div class='del'>-woimbVZ+ubV+RvWDZ8SbsdH35tuigwSUmxSkVp2CbTWCUVeWcmgLmGgIIIXYCgeTiklkk2+b8wBA</div><div class='del'>-eCU0H6g4gHbDg98i19u20WjyGgFqMXOOQeGPjw8JPDlqNdkqvZfX5o8//qDjy1EBa/THuHjefr5R</div><div class='del'>-nER0PL4YRtykwN08L3Q+nynPMwWO0Y7Ad89dhi501qUWbR6tmxV/2adIczt29LgjoHC3LW2Phx4s</div><div class='del'>-POWKdI0AG0GOQJJkNE2Nrg0bL24vOrw7BT7n2U8ndTpmPv3vjwd9NdFbz6GcFhdAr7ebnDjravpn</div><div class='del'>-aD+P8xzVlfEBdr5FOZMkGaXprGAMWgx8dk5gwQvkl9pJ4AXRrtRcWwrZlxSEIUWEG5UMbTYRAcvu</div><div class='del'>-jz6fkmid8CZRn/t9hxtNrv6KaDmGcdU+lzPhnIkGL7DNa0/QFtnSMctYP29HtmxiwkxKPG+Occ8/</div><div class='del'>-ORnhPY3T5vHjd3le1sDFWWGxqclCfmmJwwS3qs0dhFYBOBCYiFYOjctgnDavveSNG+vfjfdcVxVt</div><div class='del'>-20rdOHmJ1Pue0un1Vb53KUk6rn3r+oHSLKW6rj1WJiTVURTR9XoT6/Paq4hh0PGcyOPG5auW+vy9</div><div class='del'>-N6bGT7Pv27f4TFuMZlEtPKsrQQQDY7AoSlrmiebZ+mfMSkrCQe6b67pD3O6BbdsoRt+LHhjuoRas</div><div class='del'>-Qs8AooH7M5Hm5OF0RwmPkxeJvG5UGCufOs9zytJEhRJW0BEL/3uZZ7rfb+pahL7Gxj3j0AgtoScM</div><div class='del'>-aNucIurPpKrYUG9v7yp4sQxE9KdWP25/RhDQ0yyeb5l1WdRUMxaiyf1+Y4OSJFbU/5k4FYUBLSJk</div><div class='del'>-WleUqBv98suvlKYJHY9HXahoAyzFE+lN9kWD1BSok1LMstKw9uynbZxbbERPziMfM3A35oP/AlKg</div><div class='del'>-pmnWwA8+zCbPMMYdJqEe5FzZhd47sV4Ny+L8D+HDn+UVDUOjaDdMQGDEgtbSti7zwj/3cDhQXZUU</div><div class='del'>-xQkN4sk3yN8JIDLPc6qqyk16TIw8U6JHHc8CE+LyezJy7Yj6vqP740F5kcuFOn4i6li7cWdZNikZ</div><div class='del'>-DyNujKe3ddF22iUu+e0ksA3Gd0JPh+BAbM2QjL2eDbeNih2S+FMAg3U+wcaCkxD+OxMVEnp/f9eR</div><div class='del'>-GxY5UNayKChOYkoNmQXZ8RiVOeeWzsyPAw/wQT8/yMnLJ7YP6FgPOfsz7M/Ms0zNR20JZUt+mxOw</div><div class='del'>-LCvTbI3Ec1036tfBePqtkmKTa4+njC/1xxOyVRjrRnLfL6bjkU/+4/FAbdt5GgqU9tDM29Qg9Oe4</div><div class='del'>-6Yoi10N8WZZPibTcVsSew+zzd8e/04RowW9QGjP+kSmyzfiDk+fiZ7j4q0XB3izLtSQHY9Fy/lEy</div><div class='del'>-r+vFe+Z2LItJztA3VFUl/fz5RvM8eRfMo2m1VC6K3LtQMB57PB56mWGT2TbueDxSLhJoG9iJzQ/n</div><div class='del'>-K0b+E801fKYbWwZf27aaLsXy6pCapnHkpm2nUSY5fzaVspUpAkO8oFNTUSrP49/+7X/ttlwA+GMf</div><div class='del'>-CuvaY5NJv3txzsAB6rqiLE2p6wflpWNBY7HwREFy7CUSjMEcLl8fzUM2JGvukQ67rove8vdHo6AJ</div><div class='del'>-3GWg/OM2Bv3Y6gGWIBjlYjRCtNP5zF7+X15fKYojOp/PT38/qZ7ejv+sjPdZOYnMeD8JNlLgatLS</div><div class='del'>-0znWMOjZ6+ltF8myLHQ8HChOCuq7uwCo/GwYCXeR01nKzLdH81DvvudxJPwJYqGu+od7LFTcWemm</div><div class='del'>-wGk4ZTjT5xxF7DoMwo2jGyeaSY9NwSXq5t3K0MzjgMLBAQMWPHOYsbDPIpxuQ61M+r4XvCNWXTzU</div><div class='del'>-lPadYN26yyvSTEQ3/eqVVOZcsCNPeosqKc8zattenYdLSYVCL98ZAPhyuSoxDWnUzrI80F6dbcQz</div><div class='del'>-xb3Q2o2iRIQewnomILAUtGabe8nfLTA+FqTfIwwjCn755V93WBKDJgo2ExHRx8eZ6rpSIosl7tg0</div><div class='del'>-2WmaqCoLJucMnc5U7/c7vby8aBjFx8eHot2WL+DP+WMxILnT7XYTP4JIZ7CX61VBv/v9Rn030OF4</div><div class='del'>-MCYZDLSN00wfHx90Op20UgD5Asq5UXzoUflAOsu5arPq4a3pJgt2Wu35rY2VjYDuupbGcRK56fbJ</div><div class='del'>-Yssh0pEcnP2TQUhEl8uVqqr0BEaWdo0+1TrbIMyEiOj33/+gf/qnvyk5CDe7fX//t18sxHqnv/71</div><div class='del'>-L+wJKTRui5jbNbAYBB+f53K50svLUW91O33Bn4Nyzh7YuDXf3z/om8iH7Qx7WRbK0kTjuoFBOQLS</div><div class='del'>-pH4Ir6+vHrHKkqAcxrJ4YR51XdEyL/T2/i6tl2+ECvu1rmuV+4AwXWRewOru+7dvOl5FVHmSJJKS</div><div class='del'>-PX/y/cuLkqZxpPvjrn4FqLAsC9G+BxixgGiHdXq5XOh0OnmXlTuAYm4B3t/eKJVsMpgPnM9nDeZU</div><div class='del'>-FNU47VgzyEI28zjNCgA1TcOMJQmGWDfedDDXKIpcdelAOVEKssVX5M3OcWv0MoLD5ACuNLDHGqXf</div><div class='del'>-n4wVNT6nFeugFMd/R6Amxk3W/NKmxthN+8wBf+7DbAyU7W/tBkGVNCBqPHGjJSxQbHQAs70cFGma</div><div class='del'>-0uPxEKZjIfTOzpt02IWCgxZqzqaZvLLRMvXsYYyk4yRZFPNwN3ggZi+Ntna+B97uTQKQP1GWpU4V</div><div class='del'>-bArvuq4qJbbAMdolbII0TSmQdgSbKQjZtg4VFRyb933X1B0cCNy2MrYAsRUSqaMoomVetIKyORWP</div><div class='del'>-x0P8MwKT75ApKw/Vm+3xB3GIRvoP9Aicc7B6beXt/lDTXBw41mkZbTSLh2LVWwAMZiWvc3aGR6TF</div><div class='del'>-sKyALc7znL58/cre9dWBiDZajC8++i78n0tkHfXh32XMZvsQ2IxjxIhEFR7VMZj07MNuqaY46TC/</div><div class='del'>-tlruPwtCqKoDrctIwzip1TQCRz7eP+hwPEhkM4/Ftn2XwMxNOeiVGKPA1WjfN42WglYeNwRukQQ+</div><div class='del'>-+ZvLEwSinmUZ0U5UlaWSrWxLYvkVuqDGSauSHz9+Utu29PJy/GS2CtLJLIAbBFT25bqqKRHGIGMt</div><div class='del'>-7x9npVNjjo7ZOHAfkHBmUarhpmq7XoVVfBjsEn02UF0fKEtTuj/unruwxWJ4Zl1oRj1u3kZav+Ph</div><div class='del'>-SHGS6iSq7wfVAABvQBmMCDEr+0Zcl6sUZv09aZrS4VBrIrLNt0QQqnIdloXu95uyF/HvwVYEs5Kt</div><div class='del'>-uXNaVk6XxgHlftbmAdb7zlHlaK8sxsEuz0RxnAtBaeU2a3N4x/1+k4kXsxE/Pj480NIBfrFHlLOV</div><div class='del'>-GQ75LE15CoBZYhAkdLn80MXDXyb20mDwC+msz+aSDFqEyuqKQj/zD+O+KBo/AYvY3FEYSHTS6s1N</div><div class='del'>-8zzTRYwFA9FD1z0kGvqiL4lfLttSBwHR8fiiopd5WWkxQNI8T4QoPHcohYpQYzQH0A09L4Ava6Ht</div><div class='del'>-YsW5F4Wdta0C7Jjv2fMen72qKrVx6vqefvvtd6rEXz/Pc4qTlIhaZSV2XasjOTuHDqTPfXZggqkF</div><div class='del'>-7N2tao0JNKui93bsicpwmp3xSVXVSu6JpSfGoW1pw5gKAPTVkl+4Cpx/1xhiFwfHcIu6acbDMi/0</div><div class='del'>-aBoF/lDio8VDqe/nJEbaimZZrmV1XdcKSFv77TTNxHbeYTxZlol/ZGQOBF7nUFzCWSswN7djxybq</div><div class='del'>-WzgaUBCHI55nmrAOJgr5Gby9vYvsvdQ9ApesJOEwn/ePDzMFIs8l+HkUj2o6hpqKSSutxwfo+oH6</div><div class='del'>-flQjDKLUEyjAvAAWWrAnUinjNFM/9BSEpB/kuVKwozfoD9j+adITEwsJBhcoj+a5p9MpE9YbHyzI</div><div class='del'>-u0NQBFEgJ2RJeV47Zx4htDg+PRMtkJVo6bjOHHN1dtdSCdn+EZsLzycIAjVOGcUsA9gATnGM7jC2</div><div class='del'>-tO1FXVe0rRuPvcZRb8+qLPjzz5PncXg8vnDUej945T9AWCu44sOWFziosGg9tm1S8wt2tEm118Yh</div><div class='del'>-CAdi5zocSLXX6SjQGlDY4A3NOxB+AFKA1pW1DHbW3os8GRHy8OnD76nrWhOQ4BC975v6BfgGLrNx</div><div class='del'>-Nx682PplXWgRoBlhsDrVkedptfjLslBdVdQPg1Yibvw5e20rcx9mNWqBzThGt5As88GaCTYwqRgJ</div><div class='del'>-lQq8GlGxMIuXHZHjJFOw0K5FZhDuSmAbx0Gt6ZZlodiaOdhMus3w3bGpAayhtMHCg9oNp2cQhhSF</div><div class='del'>-cNoJVOgCAOhZhWYR6mkalVQDFSK0zbOUmvgCnKle0Y8fP9iBtSgEe8gpLwJ6PFyJd7lc//+2vmxH</div><div class='del'>-jmvZLnIeq6q7SUp6uv//M36zDRgwYPvcI4pkT1WZlfPkh4gVO3bxChDOla7YXZW5h4gVa6CiYLWa</div><div class='del'>-jcdS8EyCOuE954DJwJhjpHpz7UIzBtvvEbxTmujMCyNNE+1tgfSmSayhIWgHcCAhn2EYB3p7+0lx</div><div class='del'>-HNP5fKaqLKgoaxo/P9Trzoq3WOmXePx4NjKZvYUB5yEs1Edxihv9kurRgSTjszmMgAFMeD+iAovC</div><div class='del'>-QP87fsaFRs/Ny2w2g3M3Yg67s3pXcs1+KNJ9u900VDQKA4oTdt5xNGa+9eFOBX0IqqxQvAOtbwR6</div><div class='del'>-fRsaY29S7AEen+YSP55QKBZtiDiDrgXPDyxUvqkTbSXBh0EliA3JHICAShnZYv05HIi9CcfJCeH6</div><div class='del'>-YWCZuOyZSnIo122lt9c3yvNchWogBKE1iANx4HlkN4HvPS8LVVIRpFlG08yxzXmeUZqk9CY9SJIk</div><div class='del'>-HNUchmo6wBv7cEi3mZnD8++RocalUORSgLNU883tBIKVZCERceAjSmWo7sahlxBNdlzFS8GNbTct</div><div class='del'>-qJywKHMhEZFWIIhHRyAKTxCcb2Ep7i+WXFPkOX1+fjrLL6FWJ0mibMFfr28q6+VEnENJVnyzOGQ9</div><div class='del'>-TfkQpP6uQJrlqC8r0XGsv4FBeCY+0SrWlm6SpBqAojjsl5VkbLkKsWVSMg7Ay2EYtZSGxRqAMPA5</div><div class='del'>-8P6tjySAVsSfoQTO85LmadDbVunMKYvWMLas65pOpzMNQy95FbNcDCkVRazSb0R3p2mqACaqLoyR</div><div class='del'>-IfwBaGsNVNM00/gvHIZII5pNCMs8M4CM4A4w84qioNPpRJczq2UboffisM2yTIxuI/XpgxsRWlhc</div><div class='del'>-ytu2USu8AJuP+Gimcr3x5GpZVqpPJzqdTlQWObVisQ5S377vFA/DQNM0id449man9odO86J9jQVY</div><div class='del'>-EAi6H4dok39XH63rotxlawTBikOfugiDC8Q1P7rGQtEFO7FhYGJEIT0xAJo0y9Q0Y5pGXbgBBVp+</div><div class='del'>-WcYVnGQdKBd64zKb84by7DH7zbrKsCPtrJ83DDez+FeaRo504lsx09ElUaojHQipoPzDAl4kbAUm</div><div class='del'>-LZimuECI1cv9c24zkUegQdUXBAG9vb3Tly/PVNcV38rr7x72PO7iXvnnz1+q259nh4TjZum6nsZo</div><div class='del'>-0mw9EMBg5x5FvtstiGdddzc3XqiGl9j4jq3HDjcuLcrP4mvbRpV+HDsWSas3eGI3IO0WPMWNjtKd</div><div class='del'>-jU8Pz5cAVQW4C5huVdWFjmNVv0z9XXFMi5CycLjhUA7CkA46TCsc6Wd/NM6F+IczKHn+//iejoPE</div><div class='del'>-xi9XA9x5GtTOzhqhxDChYPeYnsZxUjolHHGwqGyFYI03gjCkPMmIqFfE1sZEn89nimMyllqrOtHY</div><div class='del'>-AwNmpGAtQW+NESNKniBgZxxWfi16esIOaxhHHb1gYeIEtR6BKDvxO/FSgOTGcaSpRQgOQRvwSDCy</div><div class='del'>-M3wVf8jPg3iKk5acFTZosHmWURTHdGsax4/30n0iapqeNvkeeA9vb+/0x7evv4V52u+WiveCCqmE</div><div class='del'>-oDIMvd7YYRjS0xPHZmeZ88e3laCCWduq5TyYdKBaR2GgJqN45nGcKE183ze5jRMJMXHuR0kceQck</div><div class='del'>-t4srTfNEURxq6cqBLVyNdV2vFFxQxyGUQYXiOC4HHcfsKT+jMKJ9nzwg1ordLA3a5gvadiaKInp9</div><div class='del'>-fWWuSBjQugyi95+FRu8SltEOaZstrtZdd6eyrLyQGRxMjyxFF6zKgh8kOjvQm9SgpKpKut0a6ro7</div><div class='del'>-9X1PZcm+EPfdTbbi4yC6nE+UF6Xw7EN1IeXbwW8NsEFsvziOkz60MAzp+/fv9PR0UXUe5tthGNFB</div><div class='del'>-h3eYzMq35/4S7r74kvCIH4bRpPG6+S9uufu9pePINEyirvnkcyzDSEhKn6r+Au0TM3SXWsz/++vX</div><div class='del'>-By3LSqVUR2wK4Y9UUDrbxGO40yzmZLa6eZTJQVCoicq96/SgtaSjpmk1tAMvzY1zmJyDTWhRd9wa</div><div class='del'>-wzgSBSSjxYySJFUJLjQU9iYOgtjLGcD3YUBuoG3jkExgR3EU0RZt+r6gznNBqKsy9IIg8SYC+D3W</div><div class='del'>-UxFzeDD+cCNic6r3QBhSGB7KzMM7ZTJbSPseeenKj8IjmHuijHbpTqtwK0JRA4Ye3XxZFmGPFtxy</div><div class='del'>-bquOrcdpVkNa58UXK72aPSAz41SVCVg+6edjNyk3draXDExFrKCL7fU3SpJCVbho/eBIvG2bp46E</div><div class='del'>-bfy27RRC5z5N3G8WwmhC+YEZqi0zlESgZZQLTCQiulwu9Pz0ROfzxZtHTyIOefQLxGjJOgPjxufo</div><div class='del'>-p83zKcAhBB4AWFg4kYsi57FUWTg0dz9ongbPYAOsP2u4gb9Z6JIqeISDoipLURt2+kCHoVc6Lls/</div><div class='del'>-zaaCCvU5OtZW5H33LHWuuwDmEPMM8BATlzhyM+myrDgsRW4P+zMBMMFBBxvUxmRlKWsMMmHojeNI</div><div class='del'>-TfPp2YBx2d6KsGfyTGHHaabrraFlYaS6aVtPiHS93pRKjBYGEWrTPOsYEO/VypLDB1DVJRhPWl7j</div><div class='del'>-f9HT42LhXt0J2oBZIJLNHsbOGizWOX6eZ1SWlYC0TjHIDEM2q4Xv4jwvdDqd6Hw+06mu9Oej9QJz</div><div class='del'>-8v3jXSYdktAklXUcR0KM44wCDRM1hjDOWIQrnziKDY6yUFXVVNcVRUK6G4aB+r5TkhF+zjRNdL01</div><div class='del'>-1PcDdd2ddTccxcVjB6voAoPKItQWcQbfGL39cTCqPI4TnU41ZXlBYZi7xe85szr6L9/QMZVFQeu6</div><div class='del'>-sGhCWgTnXLMakUWsPgPguGOysO87lQVbOWVZSlGceL9vWXbtN7M0UXZYUTDwtCxuHAZuxDRx7hw7</div><div class='del'>-s7CxCXr8ssg1Ex4jnba9C+Ox1s8OH3Z2Oc4VRQedFCWvTY3FYscBDbYXRk7gYrRtS9+//0MvLy/a</div><div class='del'>-N6JPdovQhXPEiaPiBmHIvaEAVugvozAimri9slz8OGbqc12V9Pr2rmlOiUwz3CTCiaw4GIQR7Vla</div><div class='del'>-A2s6Yr0Z8J6YGbl5BBqwH3GgYgJlDzwNTJX5d5axYxDkxJZ1aNci+zdEoptI1Kuf28BE3xc8Fooi</div><div class='del'>-p7KsPE5H13UabedlC+674hCoVrdtU0dmV0nePHPSXYhBu/z5aRo1OgwTBFR1cRxJroCLbUuSRMag</div><div class='del'>-yYPYyxnmlkVBMQgFlheOB4HFA6ME67RikXu1IpKc9zzPaRoH6voP6rpOiSsOLMMEINY8OSTvuJ5t</div><div class='del'>-9/ps3KDOwivxePAurWhX4Qq//FhZiy5HkNF0lwPX6yzcGjWGQUA/fnynaRrYrWY/9MYoipLSLKNt</div><div class='del'>-d/7xbMyQ6CK3C7uuK7XEQqqy9XnHS8mFiuwCPnjisAQO2OO0nkxn+7zouF2a58HDM2ye3cfnp+oa</div><div class='del'>-MHfn22RRMtQwkOFAREJIKimU70BEFCeZ4kSI3MbixqQIU4tCJkQYQ1r672OOvcVgrPsv9BUYpx77</div><div class='del'>-Tu298xY1Pzvpj4UghYg1cEQsyDcJRgTq8mFakyAgZT9yRFikF50r1Tttu6y67v39nc7nM9VVRes6</div><div class='del'>-qd8mgljSjNtZ66tgGaKguccRtzwANyHqgmYCOAT2FVpISwCLBd9yFvkOP2IwN6O4vXeeyyuAKQuO</div><div class='del'>-hWr8kHr6d3f7Hyr2ONU1pRKJhDKe04UTRZatPhkgCYglruRDT9pT09wUCziO+DdvPTj4zvMikwHe</div><div class='del'>-lFikAArRq6VpQm3b6s9M00ymCTvd7634zaVizBmKZ35BvTDAmOHHefWsREvF+7+X6qOk4+CoNLDG</div><div class='del'>-cBLHSaolO0pstFBpyuIQFaRUFW3r5nEl8L2qqqQkySgMRBeQFYzhjKMyAkHlthUXHzopvb290bbt</div><div class='del'>-dDrVv01hrFVYIoQujBXTNKUoZD386VQrW049BYSIYo1F7Vh4ErbeOB6/aSegILVcen5H3KrlGdNf</div><div class='del'>-V3FvQvvHMWoHrRtbhY1j77nkgmgF5p016USM3LJuEjYKnUhsotY3r2W1LWnTNAKGsuX96XSSkNDY</div><div class='del'>-0yLANGRe+FmschHaKZgble4URbz2kpirsn3P5QBhsR1MSvFMxn1SXIt1DqRRcI8GIYgUvzUNxegx</div><div class='del'>-YJ0FExAswnmedP7+aCxoT2vt07aVhtuovQs70hQUJynduzfjAehYUdDOW8Tz/e2dnp6fKIpilVle</div><div class='del'>-zidaxfcMC2UcRxNX3eq/54Ua0LatVJYnj/xgJc5wH8JEIsuYNFGWJc0zT0SYaZXQ0feejhtlOHp9</div><div class='del'>-jpFmk8q+l7wF4/bLQphWUe80K+jYVxWMoLy1Tkr90NNz/uwZVqL3DCjQQxXjM4ww8TzhqrSsDASl</div><div class='del'>-SUyx3NZ1XVNRcHuDUjPLElVKgq2XZplWhOM4anoO99+9d4PNi2/hbf/q+06TeSzCrTPu9k77vqml</div><div class='del'>-GqPou7YWy7J4IiEEguJnWYYd9CrL4kxKbrebRKVBP0GaYoSR6zwvRGYM+7jmXfpxJKlVhW72XpKv</div><div class='del'>-mCjE5ChImq1234agAqex1Glen7AG6ymBlmMNaT96WhaXZN2JfBnVK8aMID3Bmg/mLcBjlpVl18H/</div><div class='del'>-/t///eBEmEFv8TTlLDmejfsSTGeuseupzV/OIcagI1p+/OfnBxEd4sUWeiIJTBss57zvB/EXyKjr</div><div class='del'>-O539juMkXOvFhEnC0nuRwBCWiVZVKSmts/RKsVYu3A7EVOQF3Zqb6sjneaJKhDIcShnQz5+vdDpV</div><div class='del'>-Oi0AQDqOA0URS0cTCQJF69APo/q3z8uitwhcjQCGOTuqWG2roigUjr47tDBKA9sLfx4oOI9fQwX5</div><div class='del'>-KnFr7rq76sFxOKCsrqqS0jSl6/VKURTRzx8/6fL0RE+Xi1pXQfuPnh5MQ6UFRzEN4uX3//7fv+jp</div><div class='del'>-6aIb7NEDAii4ajHWxbO9AuBs/xv4HhAd9Pff36mu2SbbEccCr120Gw0tZRhGAq5yqGlVVupDYac0</div><div class='del'>-TEmePJcjYDVgrfJEIyGiQyLCYzrVJ07nUV0FG5DkWUqf15t6Rtpy/9FvwsfUdk8qjyph21bde/he</div><div class='del'>-APeOY5d2eudE6jihYRxkJBs7Y1QJlQFuE7y///uwNtzWZ7zIc/r56xfVdU1Z6sQL+BIofzGbtHpu</div><div class='del'>-nO6fn5/08vKiWMDpdKZlmbxZMxHR6+sbPT2dPX/8p6cLNU1PRJvHwXZe6k55V5WFfr48y6i931Wc</div><div class='del'>-xL2jC2aEDZl62MumA8BmqZzfv/9DZVnQy8sLVWVBd1EM2Tipqio9x1f0fHmW0q9fr1RIK2JFGdAL</div><div class='del'>-4LZ/zFxAFfPvf/+bXl5e1JAFno12BAknXPTCoCmv60avr2/0119/eqnEaIlwQKHtQIhFVdV0vX5S</div><div class='del'>-GIZ0u93o+flZD2YWPpEHAONz3243qutaOfJd19H1eqNv377qhq3KQqWz+MzwGsBzq6uSjoPo1jTU</div><div class='del'>-ti29vLzQsizUdXe6XJ7odDpT2zb6XaHJtyM/OAsNw0B//vmHrrc0iSkvSmqaxhu5ProeAdv4+fMn</div><div class='del'>-ffv2TfwFGDDGhAVtSBAEur4zGc1htHi9Xunr169cwaybly6Nzw/WKNOpBy9/4fPzSs/PT1QWuTgO</div><div class='del'>-bwpiWtWhdXcGc7nZ1KwAACAASURBVHYSP4tv375SHMXawkLAtm3iCWhVYvwhZ411Wk1+nP3A1tQS</div><div class='del'>-vTMCN5h1l3p9K2f7ZWKSMHsedlEUiRd6SXle0sfHmzin9HS9MtXYWY3vdL8Pehti0YyC9t7vrfbT</div><div class='del'>-qu2Wf4b+YNtjJajg4X1+fiqFld15enV94Ujrs/jhtbrRQGiJk4zmafCYjeu60n1d6e39nb7KwmG6</div><div class='del'>-qJsDp2nqub5YeTSAoKqqFRyK40gi3H1cAHHPCBCFwGcSyy0bwwaSkA0kxYK8XCQ6K+LvcL1eNS0K</div><div class='del'>-ZS8mRpb3gfbkcmGn3Syv6CDnZov3kKapbHQ7n3dlPPwgPj5nLVVZjAP6r/j5RYnO/XEJ2FQquyHa</div><div class='del'>-tqW6rrXl5Pfe6YUHgI9xmEXFNQcdxpk4Vh4A8iLw+6zEFuNmm8cQBE7gNi+rYim2QsYzsjRyq5jc</div><div class='del'>-910PSFQFsB2zlzJXgIkGw+J9D8OoLQurHytto2NsbivSYBDDBTrYTYQP6rwAJ47lkrLPkkBshgD6</div><div class='del'>-7kcLcn2wgpBD8IAS0k0mNp1KQKr5GCqZxBFVVa1l8+12o2EY6du3r96isFhAksQ62y7Lig+pMNID</div><div class='del'>-AOypfd/oev3wDCtd1l2nZZ0FYngMVqjfPg7bJInV+51LsU3BLGvNFga8KJ+eLpqPCEospi82Bhtz</div><div class='del'>-cfgJpCnzGDAFwc2Im8tmyjMzsOJsyLWXQ7miMIxkHDorJZfTckiNQbG54Q0ZBJ9iEsMb+eX5mUNE</div><div class='del'>-s4L2vdG1g3J2Fo99EIZ6b5w1Ul3XrLYTlRwcdaxRS5HntAnibx2pi4J1FiBcIbClbe/0n//5b/rr</div><div class='del'>-rz91ps8WWruyOhfj5KymKcaAExMNGKnkWUbrZuzm05TWZaVdSEeWcpwmsWesYqPO4CKNyZvv8OuE</div><div class='del'>-QYGOyRexVgs8+jrwGkzpMEJEZFsYhhSjjED0lE1htWmsTredKUVXUcv9UI+5IIyJiOef4Jnb+CSM</div><div class='del'>-JWwqDk7Pddvo7f0f7dWRac/jjoziKJKXz1OLqixVgIPPYYGlLMsEJMxVEosMA/egdjE/Sekk8WZt</div><div class='del'>-29DpVCvXehhH6t479YmzYZko2UFA4hLL6uc5XwC25VmaErIYenE+yjJOk8G4y96czlO/oziKPTah</div><div class='del'>-deWxwKaaski2H1oaqxm3IyE+tEa9OSx6Tgepdt7y7i27zrYuYMiF8lnb9i5S5ROFIZfK0A/EcUJV</div><div class='del'>-VeqFA/CZBTKFqulYb8+3aD8MCnRhIjULqciCYxY0PYjn97emoSiK6O3tncIwpK9fv9DLyzMVRSkA</div><div class='del'>-YaKALo+TU8/W3kXIxXpwWf3BIiAcRuLwqQRmZEeRdjPbS27bNvof/+f/0rdvX9Vnomlu0mrWjigl</div><div class='del'>-ZimogJhvM6utH8am8PTAGHFZVpVTp2nK2YA4kcbJpfKwtJPdU97f3qkoXR+NRYMHDS963GD2xPrX</div><div class='del'>-v/6TSF4A3xKx3jqgAXOJn1NAriqwtl4oV4/YF0Z8Xq88AxcKJE48/myL/t9xFNFMi24QOABhfDnP</div><div class='del'>-E1VVTfd7Sx8fHxTHMV0uF15g0yzxZ4mCKM4Hzy066+uvVE2xbGKLp5nyjDd/1/fqVHscB318fKrL</div><div class='del'>-kHW5VZWf8CZA0HosdSHDXlaeLgAMi+NE59BZmqpmHNUeo9S7cAkqnVNjbMdt4EBt2/5mjwbQCuNi</div><div class='del'>-+NGx/VZvWImhHpp933n07eMgYbxFHvfeXkZsgTZCkaaXCP4CWcpSobHxYO46jhNdrze9lc/nM3Mz</div><div class='del'>-qpLipCaiXScFqAQY0HbBLPf73QPDkbBk2bGgzWOS8RhGg7W877tOS+y/w2Hy/PxEZVnSqa6o70cq</div><div class='del'>-y1wFRwhmcQ7XqY7Y55mt6kFk4vfBz/gq1nHA62A3HmP0MRn/du7vkVIbS6+fa4QYghb4YezKInyM</div><div class='del'>-IGLN9pkulycvlcQZZ7SevBQZhCAyYJEDgNn31FuEzkfAtRUw0ET1wWKWXeWtQeCIJSidrC4AhB2U</div><div class='del'>-lNM8U32qlT8Q2FSgB+WjjYnG3Bf0W+Ark+jfmdXFt+g8zWaaQl4CEJfakTHdWD2gENXHsrpMRatM</div><div class='del'>-JAoUz/n+zz8S5ZZ7ixeTG0x77XdCdXi9XtXM1foL2nHbSZKIQYW2N1wYMAiGA4CJMsvDBgG4OosT</div><div class='del'>-b/SbSak6Egkaz6M45mns+2Y8KTt1YrbtZp5nSvqZ5pne3v+lqUfYHCBQsQ/hQHeR0drR6mP7CVGS</div><div class='del'>-DVnBO7cXosXTgiCgv//+m6qqpPP5os/q69cvEj9fUBT9YjlyGFKWlRTQoCpFG2uGUh8t7LZvimts</div><div class='del'>-++EpQ5lZuVCWha4CsNn0Lss+pDRLmR4peXe4RZd18ySRlvkGeSj03HzSFtR1NwqDgNaVb6i6Psl4</div><div class='del'>-r5RxFUkLsj+QL1zv5IwznMsu3GIgcOgEqYdy0Oapg/GHMs2ewkWeUyN+8IUsdOsptywrte1dyzCo</div><div class='del'>-sIDGW2AH5hDsBFRoIAgQ+HnmCco0TZRLdPnlcqFefN+tTz/EWbFEioGZaf3dePPExjuukUxFJ5nF</div><div class='del'>-5o/jiMkvpgqxhqO4Ce0ti3/Xi+koi7YC9a2HytEFnbBasRffPBcswpuFw2D4d5wk6Rjy7UdpLlKl</div><div class='del'>-USlAHTrNzsPgoEPz+o7joPP5TOfTiW5NqwdAksT0+XnVZGKYjsDNB7N7PmRjPYD1XQjoZs1b23un</div><div class='del'>-XpM2zyI0Phv0QPqxCcvY/OfzRaXtmKiEYauHT57nys3AvlK14upGtbC5By6DyxpEJQi2gLXEWZqq</div><div class='del'>-h5nNcsOCf3v7oD///EMcf1tPcYZkFOtAa/nMrZgfjNNMwczIdCPZdJaX3baNQeozFchM8mfw4ACc</div><div class='del'>-PPadLodg15sRC/Z+v3sJP1B0wcTExm9v+6YYx+vbqwKbIGqg14R2wRI80HehysFMFlLcRwkytASB</div><div class='del'>-tFMQBDHKvAi70bkxz4LkgrOOhB/LeHO/gwG8oshp30yyjABM4Hw8ehRqrqIw51DSMz8+V+IN0pPn</div><div class='del'>-ZdaWgkfFKYURO/MilmyWePXZyLnB7QcgtawrJWozxu5PLtwycGi6Uck5F6FUpyPWYHXbNn3vbhOu</div><div class='del'>-GiDrvP1zqsqCcyTENxHOPbYsR+KujQkfxS8Q7S3W4HEQLQbRV6cp46gN23Iea9YURTmta+MxcvE5</div><div class='del'>-wKS9Na2H0aEqdVqHVQ+sLE1pkfYJdu6oQNEKxXFM8b3rOQVlmqkoc6qqTG9ULi9Db8RidedsP1So</div><div class='del'>-Xxx6wzzPKQoDGqS04kTXRUgkqY6r1nWjJI7o3rFhBwdScH/TSM8CbQB8/B6ttW3bYTPXCtUe+Hn2</div><div class='del'>-t+uNcgHr0LOhVEVp23Ud1XVFdVXpuAkvclkWPf0dAzBQsBElOsp+8A7w8tI003y8/TioSF1w5M+f</div><div class='del'>-P8UpiA+2pmno+9/fKQwDqqpaS3ubCoSFtxrK8DwvYjmW0pTM+jmiiG9+DphIaVlmWpbNG0FadeJm</div><div class='del'>-WGZRFLJQaxglrjukVWbWPOLlpJ9gD83CJ3E/qigMejURtZmDwG/Azcfmx/dwFuIsOmJZ+K5YCEJY</div><div class='del'>-u67TC8k5Py0yanZGrnDKzSRDIAhYbMUHX/Ygvd7ZkUret2JKhqOPgA+sH7w7VMTruqiXhJ2+uJ8V</div><div class='del'>-0/v7B23bq6nmAv3v1f4uLyh7YOQis9BWyzCKiZOY7pJdgRE4522GCgofx8FjwDAM6cvXL5TnmeAB</div><div class='del'>-s56A+MJMtV29OeRxHPTr9ZWCIFRDBDjg4sTHl3h9fZOk1Fxvma7r9RRPZMM8BiU4RVuifaTVjj+C</div><div class='del'>-KBo2Mc80DL1SMQE8FmVO5/NFFYC+c5FT4IUhU3WzDJmGkRp8MMtq1AMHBwhKNCua6rqBKiECoSVA</div><div class='del'>-BXIc7FNvxRoA9MZJTC9PJ7pcLuq79xjOmogRxjx3npoOXnFt29LlcvHsp5kSmlJVltRJfDgOkTAM</div><div class='del'>-qWlbYQCGgmG4DMh1XTQDwKYmb1vvJf5Yq+1xcJvfG3mJm667JSMdxYHIggWLtYl3A54A/qqqSvGf</div><div class='del'>-2bQGOMzwrgA+jtMsAHEsz3VRth8OaMV2draQt5gTnhUqMvAiQLCxawBGJgBMyyLXKQ0qA6xxPGdU</div><div class='del'>-vVmWeWG3CBMdhl7Hm0gl9rUlm+4zGwuG548DMt73XdlfUZTQtt00rRQvGKVmmqZKmOGRREzrmggS</div><div class='del'>-mSqohmRdAA77tip9E4w7ZNLB2PIxFcdyyW2K774vv3HM7WGg8+QopjVJKY5nz2gCNymHLDqXWGd0</div><div class='del'>-QvT8/Ex1VVIQRDQOHdWnkyrK4jhWXzccFhAMZWnKvahQQoG2OpZbRGlSUdcPdD6dRHU2a2mapqmG</div><div class='del'>-cIxCX07ihKrqhY5jou4Nt0QmLsK70JVD7VPRCwKQGganlbDPF0Bdoc7Om1Y4cNjBrW5BTlilJXFE</div><div class='del'>-b+8fSpu1QhMLjMExynrtIXVp2zaD7PPIUHMnZheznSQxRWFE09SqToDjy2c1kMUF8ei4M4ycCAz1</div><div class='del'>-XFUWmrwzjKMe5FEU0e12U3csSyleloXWh5GvDVyxQp7HDEUVI4mwat83HRVy67poS5gmKW3R5mlT</div><div class='del'>-+BKGocimDk1Jknp5g6pHMBHsblK16J9xsWF8WMfcw3Be2aNDadM0NE2zoLspWfswmGAi4y+MYrq+</div><div class='del'>-vzunmNipCT+vVzqfznTvOkkLcg8NFMpH73L7gK1zrn3Qj2myTnTSC6U3+y0O3IomfG8D598Odl4Q</div><div class='del'>-DDQLZmAz6LEQkB+Pg22R8YxllzkwkgHIQ1qkMIoV9MH3QDUx6UtNaJo6Wpe7OM3wYQtlG9RmeZ7R</div><div class='del'>-7XYTzkTuRWjZeG8sTotgYxSIhQljFZT2i6Qrw7sBBwBwF7xvkFpsdegyFObfbMtsJeMqIMeCRKIN</div><div class='del'>-8KIwWKRS5IkHfr8TE+00iM14ksSerZfFOIIwZLMMQ1IDSQp/g86L99Y0N61EoaWAyhOHnwWn7azf</div><div class='del'>-AtlN2+h48DcG7rLoJcgYD8lId5e15Axxrb3XGm5egjGP8Fm+Po4j9eJQhAtcSWbIWuQxXKakGw0B</div><div class='del'>-kd6BU2gcyy/Pc93w7+//iOX0pLfdtm207Qct40jjOEpUU0VpOomRwayBFDiFoOizmxi0XBf66eiR</div><div class='del'>-PK2IdIPbzWytxJIkYWab4cGP0gNDQ7+oNn3WcSfKNxxgNgIrNESj1LjfwoYZAhIAjuM40eVCHtDH</div><div class='del'>-VNre24w4LDCPtmM/yF3RBycJb7jX1zeqqsJ4GMaatoNnWFWlptgCFIM4ZTMAIdB3KP76vpf+daTL</div><div class='del'>-5aKlN54L9+aFWlAfx+IRXbDZVzMGw/uGMo2RdTY6wVQGRi2w39YQTYTBhiEROUdirDvngRjLtGDR</div><div class='del'>-NsNiRiA04bPa9hDlcpYXRvLOJh8go7H3AZuClobJiXVqI7vt2NDlMkZqeMttNa99+xmxYXtxXLbt</div><div class='del'>-G+T68DqwbTqeR1mWdD6dNLELFQ00I7gUyrKkkG/WneYH/7FRMvieLhcqS+YOY7w2zTO1baObua5r</div><div class='del'>-BXuqqhRE1821QdYpxbffzolh713KQ3BEGNKe2lIvnSGj89W3KDj+7yzL1BHlkXBhbblA+LBmFBDy</div><div class='del'>-pEmqYy/9TMame5xmuned/v329qalNzYa+/AlSm758fOnRIJvnmgKwJiN7LKkKjybdd20pShLphl3</div><div class='del'>-Hcdd11VJiQA8YRjSx8cn3W4NzctKt6ZR5B+3jD0Um6bRCPF5npSeDWYfgDT+m3vusiwpjBhsslbX</div><div class='del'>-EKV0Xady3kdTCjz/QZKi7EjLXir7vqkFO+zW/Ci21XvH87JqWxmGoSL39nc/Ol7j+cNSbltXyjLH</div><div class='del'>-OeFJQakHBFSNZVlSWZ689kixjQeG377vwlfIlZugbEsjifbt2zdlkjofwFRp5KnoSiwvA8rIdV3o</div><div class='del'>-fDqpjV1iplFoFe/3lnMBxnFUauZirKynaaT7vaeyKr2SBh+0rkt6eXmhPD9RnjlXnXmZxdEkliSa</div><div class='del'>-TBxYXW9WFM59lo0qd40Lt0QX6/6DTYh+moUxTqtgnVt5PDjQMA6UZqmhJKfqcrNvu5bA1oxyWVZq</div><div class='del'>-hWwBJPfR2PMxf4+pwKUSpiDA4JIylZAKlrdipIkcQ/ToOtcPA0ozDh3BgrdTGJvwU+Q5hV++MMAW</div><div class='del'>-J/T+/v5bv2+/OyK00Kei7dDKYuJ5++V8oqKsaVs3ipNYgGEXd87Pg2hZJq+qAE9CDV5ltLl4QBb3</div><div class='del'>-7GVZ6cFjW4RlWagsCzqdamrbuyf4sfbctr2xUnW0cEVRGAntpvN4IPgWNINRa9+ztyHwK7zbeZlp</div><div class='del'>-7hbvUEjThLZ1ol+/XqmqCsUnAjMxAhHLXkKoWC1ZKhGbL0w2fv78pYdMILd3lmV0v7dU1yfFN/DM</div><div class='del'>-hmH0pij7cQiYuysZCOsAI+yyLCn417/+15Ek7BCDU69tG0nKCYWbnWrmuu3PX1/f6evXF7pcLnS7</div><div class='del'>-3Uw806ia8eMg8a/nLHXOd2NjgqZphGKZiNhlorZtqKpqtbsiCrS0wkz+cXEHAWff4UDRYE6jpsLN</div><div class='del'>-1zQ3Ksta/PxWQeo75eq7oIhZDCAzqXBSvdFA6EEmve/LHghANWoJj1IbpV9VVpSkCTUNG2py+Emq</div><div class='del'>-oaaYEwNxxjODdh757vaw4/FPTU3zqRr+deXnUFU1NQ0TYNIkoRmegPJ7cEilWU77tlF7b6nIcwl5</div><div class='del'>-uaumH4SsRIhEvrEHa/YXcWcCVlAUBc3TSF3fayISPCbyPJOJQqTto7thU9UD3JrWodmHSdK9XSlN</div><div class='del'>-cy2h4S+wCKclw+zbBNlaXwQ4RrvJT6imouw+RZqpaKPD4f2AdYNqDCW9k65v+iwcOBd5uAc4+phw</div><div class='del'>-MKmOE5Q5s7Ck9t6KYW/heR9iogReCE9ddiXrgcrs2mheEywVF2zn8/P7gRIJuWNdP2jKz48fP+k/</div><div class='del'>-/uM/NFrZlXo8f0UsN+yQbeABEdHb2xsbVsYs5BmGgZ1yhEuNOXuepdLr7mqc2TQ36ntW8zHldPRK</div><div class='del'>-MDv2A9KJHh4n7sfHB10uF42tmqZRxoC58sOBjMJCjBVlk3rZ/fXnH3pyW8qtFYqAATYb26l5nqhp</div><div class='del'>-eAyH/xbuNhy1PmvcM1tntapmBIjVNA09PT1pZWJRZ8ufh5/gXbzy8S5ut4b++vMPmTYsKnXGiAit</div><div class='del'>-B4g/ViQ0zzO1bUtfvnzxVJCWc28Ze9aunAFe5pg8PT0p2ImLoet6VRAOQ69aCw2Jjfnz/f39Hzqf</div><div class='del'>-z55IB2sQm6quKlrWVTUJSBbO0pT+/fffVNeV9t7o1+GrYFWrNhUpzRgX++fHLzqfT78Fg1i8pq5K</div><div class='del'>-imTk+ePHP1QUpZOE3zv649sXJePY32ezFp2IyJHTTnVFTesCUKE2ZE5/rp4GzpfAjbJxob2+vqmf</div><div class='del'>-gyOEOVfhGKDDtm3iRNqzt5wxO5jnSUt4II1gE+VZSqtBP7XHDgPVJH9+fmjceJLE5kEsiiK7Pp8d</div><div class='del'>-V9/eXtX5BP0Reqwsi7zejcMeJ0XpwYDbBDzkci5TeWhpAEeUkTi1Me4rCgbPgiD6zc4coKELkti9</div><div class='del'>-eKvjIKXtwixUrZxl/AjGm4vmmtmL0JCMLLMSI7txmoQWmygzEtyD/uH9oEpg2u9ivPVJKx+n/yBv</div><div class='del'>-kdhxlhMcpeoUZPv2x7+4QuKQ0Ka5sW+CMDzBOrXPEm2eNRuZ5oX6YdQpkfWMHMdR3nNBeZZRmhU0</div><div class='del'>-zTe9TNBeMfGHAUJu59xoGxx9zPOtFn+cZrXB27ZVy2goLnGQvb6+0bdvX6VVaVVDY4NPEK2G9ovb</div><div class='del'>-7FUt0raNS3Ec2EWeS/IUsLY7PT1dZD1t4ma16uewADUuB7gRpVlGkdjIW+k0fCvWdaGYxRS5IrZK</div><div class='del'>-4BDTS5TDdryBnhlc6I/3DyHYnHS+30pc1TTNdLmcdU7e97364eG2BEkkFals0zR0HJwvMM+Lx9G2</div><div class='del'>-OXF6cOEWE0okZJIs2ZzUGAN8b/TjCHkMQy5pkZSst91x0DyNNE2jotZWZrptm0ZeYTHhVoLs1UWr</div><div class='del'>-zXqADkOvpaNjDvIGgGssDlOmj6Z0HKmWlFFU6gFrWyELbOG2tMAn6/idKevpdBIKdqKzZ2vLZkdV</div><div class='del'>-mHIAL3I5DoHSU53VO0tp6zoiokC56VB46uUh2BC0/mlWqBORH0Weqi4jSVJFtaFpgBgNhwm48Tjc</div><div class='del'>-mVCT6yGGQJD7/a6HE2c7zFTXleIN+77T9XpVroPTMvBGf3l5Fk2EH93FRrWzZhOg1ZpnoihiIPbX</div><div class='del'>-r1dKU/YnZKl7LI4/LseBD7xdyVbWkGdZFnp/e6eqrkT2PnkYwxiGdO86iQPLdbRvI+yDIKQ4z1Iv</div><div class='del'>-IsnO8ZmVF/w2RwfqiNOnrEpB+nMta/p+01OaUfuEEjGo2I+Djn3VPtrO0tMkpXvXyedIdT6KUmdd</div><div class='del'>-V1oE9MFLh/Amz1IKVEu/6yQCaKol/Gh+fBjqGApjtjRJJXpsUStw0FanaVZGGyih+76YYNNUk3z3</div><div class='del'>-faddyBu2XOeflXuGGnjh29Z7ElN4FeLQ6aWXtgeVA4L4YMHz4MpnNWm3iW5wtFMuU3FURR4qhyzL</div><div class='del'>-qOs6SuJIS1iLIjtptRv1ITUHLLYiL5Q6vK0rdX3vjT4P0y7O0+BVPCBmuUM6UFEViDMcStLpGPQx</div><div class='del'>-Is2G027bpoYdcKPidRLpGLGuKmXWRVEkk61Kq595nsWVueZItyikMMyJqDEOVNb9OvRuYBzYdc3K</div><div class='del'>-SvbIJJrGQWXCMESB8aodo1oOTFGygS0o9NYZyI2TI2370HJhUpFlKcUs1Fm8mK5RblfL8LJkh0dZ</div><div class='del'>-LysCU6V8Wgrv/d5JuRsryLWuG8XRrlRRxgImRZaxAcZpoo+PD3p+ftYHCPEDFg1CK5OEI84XOQkR</div><div class='del'>-OFLkuUSUiY7fjpyW2SOj4AXdmkZNFqMw0N8JNSRuwONIaJwm+v79u9hhEX18XOmPP75x3yiA0uPt</div><div class='del'>-zOUwp/ygekDqjHU6enSASWJmN1pCE8pAjMPYhShXXMP6KIL8YQkyy7oqAcWCV0CxEc2N6gcHTxxH</div><div class='del'>-FEeR59IL5B1KQbgKv76+6RqxvTZm4zbfAd/NBliyUO3wLOqDIFDKMucCxppuZCvVR3n6OK66NmEY</div><div class='del'>-EwSk+QBpVtC6zDTPg4yTU91UCCvZ953WZaaDDrreGoqiTg9o6zcB3MNpN3iKhTDeQhylYWNncQZM</div><div class='del'>-SpgIxZWP88JcJWviJNoRomluFKhkqjRPupZ50e9grflB3Irt6cSoZqxEFKi2ONEmMydMpP2W08Bv</div><div class='del'>-enBkqQMymJQReSAZTDjSNPPUc2CfoZSE/TUWSRAEFAqwBztrTBSQ/ooTU4lMyyoz5UxPSvTnuIUt</div><div class='del'>-pRNtSZKACbfR+XwWgDTUchKfdV2Z5lzXtTxo0pIMOXNPT096wFpLbYij8NmtmxECSGwGAqYhRMR+</div><div class='del'>-DCYmzfrEp1lG8zRpm+EmIpFx3s31fWh0m4nItmIe4AbsYZBoFWQJP4+RcVVVUd93NI4DhWHpaeYt</div><div class='del'>-M9HejPguavstt7pyBoZBo7tCY6sFzCkMIxr1e84acWc3DVpI8P3RdlZVSW17p667/3ZjL8tC7X1X</div><div class='del'>-kByA5CjOzS4H0SUWofLcNheuyhLfSMM8EHdu9xVufvBHoMewB5qVFg9D702leHKV6++Ik0jbAxYH</div><div class='del'>-pT5lGSw5cI6rqqKnp2edq1pyilM4uX7EppyCxpmawwKuuXle0iH9C8c8hR4wUZWFzvZRaXCZnmgS</div><div class='del'>-LYgiEFDg38ei08ZcFKdgmibU9R1rzfteuOOrAnqQBicmGNJy6sMHggqyBfd9E1xho2XhkpBLuovm</div><div class='del'>-xF0uz3oT2ufECzDREnieZ+qHUaKkNr0peAOk+hz6vhdmGN+4uHnZ93DQA3IRDGRe/HIbh8ayLHS/</div><div class='del'>-t8L5X9QYNZW2D7fYJHwATkYelRAFsOu/0m1gEa/rStfrVSOsy7Lk9xuZSYjhqD+yIYeh98gxOLQQ</div><div class='del'>-7ILRIAhIifhTAOxkGbojYqkhi3j8TUKIAqDIepVdKw/3mfz8SgbO+EJ5e/9Qhqm9RCzBJwzZoj7P</div><div class='del'>-Uh1Xw94e7wAg9qOxzDTNGvtupxNgZGIq13U93e93r2UBw3IYRnp7+xCrsEPp6RhFSpUcm4z2TBYn</div><div class='del'>-eaix5sXJKQwars1qs9Fc9oOjOljXXoI6NpdXHwYUpImJP549WaU7sRO1ZkKflWWZhH8ShVFM69oa</div><div class='del'>-B5ud4jjVXLYkYQusQ4JG8cDxHRe5PVG1gMbJ/7wLn91l8l2vDVVVocSLYRjo169X73lgXux6N1I3</div><div class='del'>-HeAr+C4wMsEpfsifR99urcOtRgKHHWK6kXZk+2huWWYjMOK+sCxy7wazYirc/FmW0SBEKbxvfB47</div><div class='del'>-jnx07LE0bphyMmOw8Zx4QYLC4YHPUhSlphp9fn7K2DihfXeUbfT7XdfpM8Dti7WYiogGDj/47BZj</div><div class='del'>-yfNcM/jc4RTpmBAHHDvz9vrf4L/DLYznjnXUNDdhs85KwsH6jcX4dp5nqqrKk3hzS7wRUexNWqwZ</div><div class='del'>-L9oMawYTx0wgi9KEp290mPcZelmNDISOTNxD2cimi/ylwdUuipzyLOcbYBh0XssjsszrF1HitG2r</div><div class='del'>-1cM0TTSOg4pvptkFP5RlSWlW6FgDMmA+/UatPoIg1NOdJwxOPIFRDYNfkcye78pIXCR4g91PYwWV</div><div class='del'>-0D+jX06k3QFq/PHxqYcElHbor+OYg0Cen57odDpp5XM6nQxhJpCgiEk2ys6eeRJGse2bZzGls2/p</div><div class='del'>-8+yEgIhfHCTF1hEYYNLlfOIKS54NKgybneduIf6suYw5MRkJ5TC53+/08+cvJ4CKYhPQGooV1eGx</div><div class='del'>-Am1kvOO9r1qdzcus6wKINhZ/VZVqK4bZOqoVsAWLIqdURqaW7wFpM/wmdjF0OdU1nU8n2YybquhQ</div><div class='del'>-eSQPZJyqYu8HxVpEigx3pv8qHRttACcrJ14qMkbWvCZcajEOiXXb6HSqmU4tCD0OeTBjXRQ8c2VQ</div><div class='del'>-mSgNXRizwLjw89HbQxdgE4rBpIUmJMsyHgN2vZ+qYscZhyxAuLKodxv5fGosSkRl3W43ZVVZtR6Y</div><div class='del'>-TFEU0TwN6tRrx4sQ8uTCfrMIqA1zwIO1M1xNYZX+HV++63pDe3W9JQQ6+P3sU5jTqa5EfrzpiYub</div><div class='del'>-Ms9zyeILFCzFS0jTlMoiV0IONjQcl+I4oYACPXRYMDTqjb9tm5pqsrxzoLqedKPBv46TgCL1KeSw</div><div class='del'>-h1SrBoxWkVqoDgAAEPFJREFUXR+feIfs7XbTfjqKQmX2resqHHfWdEzzRFmemeiw3AMg8ZxRNdn8</div><div class='del'>-gff3d5ombpHs+NQKXtCPL7LxjiNzgjKJ3srzkkE3xXZ4zq523DmHl3IGAIPH2to+AKrLg6MU/ndd</div><div class='del'>-FzV0gZ4fVZB1XQI+g+/Qdb1n88VTnZAPlbo2TkjO8yCgQOS9s25G9gdwLZ9zH950QmUPIWzsg1w6</div><div class='del'>-9uP3Qpl/v3N1fD5flHWo6+nz80p1XdH5fFKiBX7gNI2qVoLUFPReOw5Tb7fTibI0pSTN9IF197um</div><div class='del'>-7yA8JI4LNf94PESs0o7LaZ9+jJkqUHocAPaUQ0rtfozq5Au/OLDAdpnbr+uinwN+fWVZUV6U1Lat</div><div class='del'>-aPWdkg0HwTj2KrtN4oiOfVX7q3vXa6kKYUaSpGrueJBTsqE8tWM9d1BGakXOz8LlKdpIcfamb70M</div><div class='del'>-QiQsYz4/yA0CQo0zqiAhnjjM5nSqKc9LJQvB9xE9KEpjZMzZigDeAvf7XUtlTJbwHVEJ7CblFyQX</div><div class='del'>-JgMluhn2fVOpum0pt23UVoRj6UcFmm2KtA3HdF4JE93vnY6oIewaJeT0x4+flCQxffnyhXYjT8fv</div><div class='del'>-c+vMHeI4GNDOQZt/v7f0/PyseBIz9RxbFLLnJEn0UgUtGj/LZRDaEWMsPAWOHkO2AbQ9WHvIuzwO</div><div class='del'>-NjWJwoiOw2UbxKdTLS88p3XtHuSvyW9sLxYJzaqLx0Nl+yUWBNU1c/nzvGTLos0RjLIsknIrpP5h</div><div class='del'>-TGPjxsbp0I2J8s4l2nArgL6UwTbShwkKJvdOq7LlPj8/6enpSUtN9EZ242ECAjUbOAV2RONIGocS</div><div class='del'>-mWajwV+WWZxvS9U6YOOkaegh7yokEiEU+liUhGmaeQwygJWg9WICYBWDrn0KKMvm3zIE/JtvfUgf</div><div class='del'>-3qSEn2iaZp3OsMvS4gFVNm0J1ZAdXfKhkSjzEqYdoxxeltwTBKFa0MHohAG/wHvuoEQ3TaMMQfTH</div><div class='del'>-eZ5r8GnX9YqEWwoxvifH1NXK/nRis4PqulTl3ufnJ8VJ4jn6qnW93MTANWwoR55l6qVg3YUsp8Za</div><div class='del'>-6zEnIvJwFtCmY/VLXL1cAjwvjLlBcLJELpT6URhoQAmew77vFBdFIYET4W837TD0ctNE6j2GhT/P</div><div class='del'>-uz4wVAtcMkU6LrnfW7rfW0rTRFHksmTJqnPT8S2o0ctDXPRYGQAkwuTg1rTUNI06z+KWwBe06DTA</div><div class='del'>-JA495SRcLFqw1wBgDcMoCcEcojlPE82y8GymnxJMpCTGhKESfjhaFnDAJ3HAARiKiQeYgta7nZHf</div><div class='del'>-2GTVH+prWFalcsM5jNU/ADTFNvR5+/aZOnmvlRyLJFvGkpymm1JAzvjVahE0YkonB6FWMEmSUJxE</div><div class='del'>-dGsaAUB32gyRyG4GVAcAqHCQW4k3Dl4o46qyoDDkhY93G8UZte1NCU0Qp8EK3ZmcRlLl7F7MGSLI</div><div class='del'>-yiKXzAB6CPV0fAmQb+Z5omGQqHWpgtr7XTEwHC7WuMPyHlAhweEaBy1i1zG6DALSypGDcpmEFYWB</div><div class='del'>-HnqYUqkXpTy/aXJ7Axb9RMQ8gH4YKBBQwXeXTdTT3d6S1tXUUj9RlsAgg2g1RhCbChbYE2BUUMSW</div><div class='del'>-d+jhcVMjeAN91LpuBgTi0w0lGLjkcMyxvvZW752mmRgkck8GcxJWV4UqqUSwB9tqlbQfPeV5pimz</div><div class='del'>-KOlAF8WNw5wIF4OG0tACRTachIHPyTsQ0I9P80SlpBzrjF1YZHGSKkbzOErSymzddNph0WTwMECV</div><div class='del'>-tWKUMAwpNMxJO0nAbeXGmJNeHta7AbHZQz8ohmCrg02rwljf1yhjPOtteBy7JzjCpsGYDeuSk6FD</div><div class='del'>-WpfJqCNziiLY3Ee0rn5oDRyZgNw74DcQYVrvHXq4reHR50JsWPGH9ClwV9I0oa9fvtDpVMv4dfTE</div><div class='del'>-RLaNw4gzMJgXEqH2/UVowquCvxZ8v3cdtT9+Up5nHPCS5QoKQpXpyZ5l0hOGIcUowUCxRInBJTYj</div><div class='del'>-nGmW0bL23swXC8U60uIl30VkYl96HMv0IC+Vsmr19JYxhY1RFgVt26Ea9nFcFWxajFVXXdfCiGI+</div><div class='del'>-wi6jPHsjop8cx9HzfTv23evFsaj4Vl7087Rto2M/BjtLGkeewYLck+cZ/fz5S01QgoB03Aj7KLyE</div><div class='del'>-RzUfSjWLqjvDzU0rDp7hFmKgEuipD259QAyCGf6mB6I6wDSiQWK2Us1kdCMmeAH+V/ZWfkmeKJiK</div><div class='del'>-9ZHEER0Zh2wuy6rOvlVV6o21rg7U3YJAx8tO1bbKZvOpsNaabd831YQQ69oMsYZ06uKMPNff2lY1</div><div class='del'>-xxSWHrz0Lbcf6x3aj/0hFFXR+zgyGgYGg8d408PBrnOLKTz6KNrvm+eFtk69HMKYkux7oHoWXLoQ</div><div class='del'>-E4GFaUVdwGgWsb3b952C//k//9uBEdOtaWXkwppxd+I6JRKyxicxreSct9nrkbk/zPTh4/8HF1bW</div><div class='del'>-yofKOYeSD77mIMJwj76bcSMZn/ZY3F4WJUZYvTjMIhkAnE2oiOOe82J1+fb8gBiZZlvyUOa1wBwS</div><div class='del'>-z4MAnx0ZCVma0sfnJ0VRSE+Xi2oYNCXpfJHfFXibE/+MKmnbNsrSTMlBFiuII//z+vn2TuttWwH+</div><div class='del'>-s7HyO+znT1MWfjln2f03r4XjYBsvvtVZX4B/D14DpgEufjw07QBboBUFjyqTJPaqFXgepGmmAbXc</div><div class='del'>-OsUqeuIqYfa+rwP3QnmWgXoV2EmWNSjFe59FHs0isUInNAj8nOdJKOqL6kAAiFpPBg7smH2qt+wf</div><div class='del'>-PGOU5D6YuKt/Qp5nXvVh2zLmMyQS6NEJ32FSTAX7hFvjjKIoo6a5Cms08t4LgGHQ8adpoqC5/XMk</div><div class='del'>-SUL94NRwP378pKLI6Xw+U9M0qidellmRd0wHrCLPykfBF397e9dy3toeWU01Tkz0y9aN5Xq90dPT</div><div class='del'>-Rf8MXjyCQx5vJmfdzOo/RFq5uSqpOytcgR1t2VFSgcziWYAN+frrlYqSJcu2JyzynC2z7x3leU6n</div><div class='del'>-04Xa9kafn5/0/PzMscwSh7U8SFAfP7t1kPn8vNKXLy+eE9Mj8QY4BiYH9kbB78dBhAWIYJG65nn0</div><div class='del'>-uix0vV29Wz0MQ3p//6CyZOpyJeCtrfg0y084IkmSerr519dXtWhjw5VQKyBURnj28PNDBTNNE3Vd</div><div class='del'>-R9++ffOchLHmbNAIQEFUWZiB//z5k6dTgtuogeviDlc2KdnU8xHxYkREP378pL/++lMdssLQof1Y</div><div class='del'>-/wCg7YGL6rTrOvUzwJ8DIcziKfYzowrouo6GYaQ//vimzxoEJQSkAnd5fX2jui7Veh4jzKZp6eXl</div><div class='del'>-yYuCh+tzEEg0GD44wJnL5Syz7VzdZkFNTZNYmU0oOW+3m4JX+FJdd9dNcr1+qr+cLW9sJlySxAak</div><div class='del'>-iNSJFcaH9nS0c0/w6x+FS6BsWgYVnHlsa2JxDRujbdNh8jyj8+lE67pQVbMXHmb96iA0z0qsYTyh</div><div class='del'>-lwonEIuwTa3Suq4xVMxEe1BNNVagchNUfvXoprYiABMNt43jtx9Cfd29Del4FaQhsPhzaH+sHwBu</div><div class='del'>-mDxP1Pbcj20LdNT0GJ/FFvADFXnBpJ+ypDhJaN/ZI8Jy7h2GsT3Yve8ysSEvZ/HRORqakDSJqevd</div><div class='del'>-eBa4BVqL2+3GlUaRu5aKHEsvDCPatlmnHHmeKZPR6iPQog6yqdVlWXIW0EoAY7AxbtZ3weo/bNQ7</div><div class='del'>-Ds19PyQF+VCqNwhQ6OW3bddJHlepuwbtWJm/i1xPtPqOl3VTI0aXFMthi0laUBD88l42bi8HRJjZ</div><div class='del'>-uyH12HDRQE49kBCsKg0fiA0zVol9WoQMlFKSzF4ZhxuAf9ZueuPYsAITpT0uZv5vN75dvFbzjhcH</div><div class='del'>-80seGfHC7SU3jzMUIiLqdZRmQ0ERZc7g4m6synaa50FP3yjKdPHbkhXP2I72vv/9NxVlyfLPB8PJ</div><div class='del'>-IGAhV1kWyglHeQivP034kZIa1VaWsYy6MziDM5ZATqOAT+RSbxwY5aq2TJB8N75dWTf/5YWqsqQw</div><div class='del'>-wucs9Z3gsANJy7dgj9XZGOvKeTE6vwN87txMT+CLB+k0vj+AT8sqBEaRZ6m2rQ6bikSe7gJkwzCk</div><div class='del'>-qixUQAUZPPYOuzNxCzyFToWJjRcGAXX9aqLfe+f6HEfKUWG9xiQt7qox6gCIrWgO77yqTqpc3dZF</div><div class='del'>-359/+B8spsoyii0Cb8cSwzjSvMwKEAFAsRvR8qkRLb2uztk0y1Kap4Ri4fNneUHL0picdf5voNNG</div><div class='del'>-2mnT3AQwzNSJ5fHEn0ygBHp53KjO/40Zi3YsZkdfLn8t8r4HcuitWxL44rxg2t9QXFZTuuDQ6Zip</div><div class='del'>-73ux1T48U089oEQ9OEWRIeks3ggT3IiiZNLK+XRS11vLTrtcLoq9WK98S2BiDIS8jctBnb0njpnn</div><div class='del'>-SW2t7GYHpZZ9I1v97wBejtNkvO6g2Uid1Zy4SgNBZ/p5QrPkBDpV4uT1wk3T8u0m5a/FOCxQOYlQ</div><div class='del'>-yt5w+77R+/u7tGUnja1jiu7mAdr7cSjD0h40MAHBc9j3nd7eP/QQsu2pcwXmsJuu72g/GGCe58PP</div><div class='del'>-a5D+XJOSkkSqa9KwXLhIAY/Bc7UXGS4enj71orhdPG6HJWBZR+vwcVRmN8e27XRIv29VUlgUls8+</div><div class='del'>-inoJ831mQXWKyo7TTG9vb3oapUIBdWknO31+fkrZyw8hoECFRTrXNtFS1kl2GEe1y2azzUVptrbc</div><div class='del'>-hzsQej4LFEE/ADdVTAAGAfOwiSdZ6HYMComtdeFBFQLV32yca1grwFRQeC1CpWUptZ+frEu4XJ7o</div><div class='del'>-y5evFAstG88OQB5YaaUwxg5DXbYjQmuWYUtX6C9wewBpBsr9CKix8qz0bOB9R6JImW79MNL1dtVA</div><div class='del'>-VMixp3kRs9BApyWuMkl1wwEUhiLOgZ6ruhy5NjVR6zFL+4V9HcDuz+vVmwQEQaC6B2cMO4nv3uJd</div><div class='del'>-HDgYIAt3HnurhK2MdGtaGkcmk0Hnkee5KhJx4KBN4RQoNrcZhtHZ7JcMLoM+D/KVnXAp5z+JKZZW</div><div class='del'>-wkbFAyS0Kc46xbFJsNhU9kUiW9yOriyy/Qh88ElJOtdcl9XjL9ubC8IRhCugVK0qnmUy3z70Nlog</div><div class='del'>-IyOg/4+MOkhAp2miuq494gbwBsu7hwcf7LVcsOOio0Gks9oZrZNU7jrBQEsD9xiktNZ15bHNbBQX</div><div class='del'>-fkffd146EhY5CDKMFE90vd40odhVNc70Y9s3KgoetUah8+m33A3779y7SRXQws9j08zYc7DFYke/</div><div class='del'>-nxclbetCt6ZXNSPGYmzUEWmwCxJ1HxN0sOk4apyJXgjggNEJ+ypGKgBzVGbfaQeH4rq6No+NOyuK</div><div class='del'>-4oyWe6c9PNYyDphHYxS0DAgnsb6QSZLKBIVTg3n+P5sbl3X/EL4lcUytyHaZyEYauYd9AGyGtQ5M</div><div class='del'>-Vx8HUro02qN19XkXbetck+GPYBORbHAqHL+gkYj5RfgJwKCZck8/UJ6nnkINQgksKDtmQQ45NhRu</div><div class='del'>-LCU8CNI7iakmRltw+o0ilqrempbWZdKXZNFtgFwITgT9FiabIBNx6Ejs+bLFMbcjmHyAJgxj0m0j</div><div class='del'>-Z3qaxNTnBeVZashNZNJgd0MhznTjrNuqYp9Z0oHAzIJwBxsAwFOahtoOjeMklk68+NhsJKe+77SE</div><div class='del'>-rMqC2nvnTQXiOKZj32mZZ03Rta2O3ZioVLCI+r6jMIwUqG3bVtKaHIiKvl459ctKy9oqgIw1g3KU</div><div class='del'>-vRldJh0AQsz8eZw2a54kfgaLcjZVf7Ls1/XJdkyZJEzJdaCpu1yYiTfR6XRiMHWZ9MCOTXgH5uez</div><div class='del'>-gKb2gM6Ez0BEtEWuQuYIOesFYAlYcMrKKZf1Yzn9+GcbR4ZDP8syKotCK8RxGikvck1rOp1qz5vS</div><div class='del'>-8kcwQXhkfCrOJlqCXTAAIqL/Dyy2Xw3ACWE3AAAAAElFTkSuQmCC</div><div class='del'>-</div><div class='del'>-------- =_aaaaaaaaaa0</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;26389.957885364.3@twelve-monkeys.helixcode.com&gt;</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAgIAAABaCAYAAADKBz5/AAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhIaFX5RmFoAACAASURB</div><div class='del'>-VHja7J13mCVVmf8/Vbdu7tu5p8P05MwwTCQnySAgyYTKKogBMK26JtR1Dav+TKuiYkBRxCVKkKDk</div><div class='del'>-AWaAgck5h8755lTp98c9ZZ+pud3TAzMEt77PU0+HW7fCOe/7nu95wzkKb0L8+GuXqmvXdzRHaiqm</div><div class='del'>-R2Paglik5ngjYJxjGlZ9X1+uPxzm7lC4+u/5XOHRn/3sfh0PHjx48ODBw6uC8mZ6mP/92QeUPe3F</div><div class='del'>-2aZlXdrR1Xtqw/j6k3vjicoqNUzSp2PrClplJY2xGqpqK4zaytbP7F277JYbf3xPwXUp2+taDx48</div><div class='del'>-ePDg4S1CBG79wfVqfyEVSeWLX0l2FS6dMrFmmuLXAts6u5i/cD6nnvQ+fn3LL3noHw9y9vnn8j/f</div><div class='del'>-/jn+gJ9Eoi+xddtTnzn11A/eXiyYlnRJyyMEHjx48ODBw8GhvdEPcPP/XDV5oJD9oBnihlBcbfC3</div><div class='del'>-TmBb7yADXR2sWLWB2Uedw4xZMwlGoxRzBqueXcsd9/+VbCpDJr2tSk/k3vnu8459+s8PvtgrCIAt</div><div class='del'>-CI7tOjx48ODBgwcPbxaPwF9++mnf7kzHBZVKxafymnXOQHs/6ZzCjd/6KZm+Ns6/4lpMw6Shpopx</div><div class='del'>-4+pYs34rqUwGza+B6kcv6CiKwZknzUw11FW94ze3Pr5GEAFTHJZ0eGTAgwcPHjx4KAPfG3HT39x0</div><div class='del'>-Xayts+eT2Xzue4Sb5w11divnnXM+a7YMUNRNdu3p4777HkLVVHr6B+lPZDHMImF/jGAkjF0sEoxE</div><div class='del'>-sYsFGirDwUg0+OSa9Xvbxfuo4lC87vXgwYMHDx5Gx+seGrjzr1+c276h62taqPI9+oCPlvmTec+7</div><div class='del'>-r2fqlFmY4alcdPEVhCIRqmsqSefSxCoqSScT+ANhjICNBmihIKpPxQxqFE2D2mjFImA1oANFIC9+</div><div class='del'>-OmTA8wh48ODBgwcPbyQR+P4Pr1TCmfyivm29Px4cHDzFopJ1Gzbxzve/j6lTZgFw8y9+QSwaxrB1</div><div class='del'>-0tkMiqqRSKb4wFXvJZu1ePhvj5DPpVAUhUI+T6QiSko3MC2rCagFCkBO8grYDIcGoBQy8ODBgwcP</div><div class='del'>-HjwIqK/XjQJJ8/RQTfVfO7v7T776w59QF550PjlD47Of+ibvee+VLF6yhGUvrMIXCqHaFr/81U00</div><div class='del'>-1lWj6yb11TF+9YufMW3aRAzbZsHC+Xzx6zeQzKewDZtxNZXzgXFAPVADVAIRIAj4GQ4VeOECDx48</div><div class='del'>-ePDg4fUmAnfe/NF5mWzmr6l+Ju7bO+SbdvR5TB4/EfCzY/culi9fTnf/AJZqYxl5wMe7L3sP//Zv</div><div class='del'>-HyIWsln58mpQCtiWgc8yuejCi/jK576Dr2gR8kNNbWwqMB5oFGSgCqgAwoIIaHh5Ax48ePDgwcMB</div><div class='del'>-OOLJgjd/5/wZmUzwJ35/8KihREZZt2U3xWySO/5yFytWr8MfjKKpGnWNjXz+E59kzcpVWIUUHT19</div><div class='del'>-PP/C0wwmB+iPp3ny6cfoau9Az+UJ+KA26uOue+5hfGM9c6dPtB5+etU68T42YIjDyRkwGK4k8HIF</div><div class='del'>-PHjw4MGDh9eDCDz15/NCvYZ6naoFPrhxd6/W06uTzCvc9/en2blnF7bPR9inYKo+Jk6bws9+8iM2</div><div class='del'>-bXqeLdvb2Ll9E2kjTyKRR/Gp9HT0ktPzKAE/Q719LF+6lIxRZPa0JmZNG289+PjKnQyvH1AUJKAg</div><div class='del'>-EQGD4YWGPHjw4MGDBw8c4dBApj9dX+juunLSrOn+n9/8KPPmL2LHll0EbBPFH2D+0VOYNXMShUyc</div><div class='del'>-LavXsGDOXB5/6HkKuTwP3nMvzzz5LIuPn4dt51mweAENLeOwsEnreQYSOaqCQWJakEBAt4A6SgmD</div><div class='del'>-clggSCks4JQVeqEBDx48ePDg4fUiAsVqKzzt2BNnnXHWtfhUjRlHLcT0+TBtH6qm8qUbv8bPfvEr</div><div class='del'>-qhrqiFaG6I8PUDBsLBT+dOfddLR18tGPXUNdrJnb/3g7119zNUP9Q3z4Ix/muJNPYzBnE4oEWbOp</div><div class='del'>-O00pQbACiEokwO8iAV7CoAcPHjx48CDhiJYPBpXGgekz3/6Az998ybe+/H6eWrGbcChEOBxhKNXH</div><div class='del'>-I488xMypU0nl8/gNBdWv8Y5LLuelVS/wh1v/wD333o8SMFiwcCE1VXVc97HP84tf385Xb/wmd9//</div><div class='del'>-Bx5+/CGqI2F6hrJQqhKIACFBAgKSN8AjAB48ePDgwcPrTQSWPbcy9dDybS9rhf+65OGlHRR0hcqK</div><div class='del'>-KlKpFLbi5667H6KYLwAKpqqwaOFCbvr5TbT37uHUk05iyTGN9Lb1oUp7C158wWI0xcfe3b2EolFC</div><div class='del'>-1RGUbMEnBv6AiwB4ZYMePHjw4MHDKDiiyYLvXzLJfmZ7ccIrawbO9WmBgKHDzJkz+OY3v8kra18m</div><div class='del'>-lUljFnQCqkqqWCQUVOkb3McjDzzJ4O6tnHr0eKojQXZu38Vzz68g37aB9dt3oIY0HnziYaZObaWl</div><div class='del'>-2s+OHR3ZLbu6UpQWE0oBCSApjjSlpEGdUsKgt8qgBw8ePHjw8HoQgYdX9jKtuTYTT6VP9PsDE1vG</div><div class='del'>-N9OXyPPD73+XbD7Liy88S3NrE4/edzOKFWX9+hWsWv48mf5txDSF6dU6x4YKpLNZJugdrF6/lueX</div><div class='del'>-beZvTzzG2886jWNmNJPr38PSFbvSvQOpDJAVRGAIiEtEIEepesApIfTgwYMHDx48cOSXGFb29Mbb</div><div class='del'>-FJ+ybfbsWSfd/8Bj6g2f/gSnnX4KPr9JMWuh+VQaxp/C939wHrNmtHDvL3/CR945kw0bephp5mio</div><div class='del'>-q+P0TJ5qn8L4cdUEYgHaEgaP3n832aLGF649E9te795y2MLbfdCDBw8ePHh4Yz0CgDI0lFXmHd3o</div><div class='del'>-69nXc2FXZ2dg1erV7NixjWw2RbBCY8/WfUyc0MSiRcex4Jg57FtzFzVmEX0wS7BCQ0kV0HwKxXFB</div><div class='del'>-lEyWHXGbSTXVRKsiBEIhzjllPvc8sioVT2ZTYvYfBwbEz4TwEOTYPzTgwYMHDx48eBirR+D66y5W</div><div class='del'>-Kir0aE1ttKG6oS5ayNvJ7nQqPpCyM7/9zp2jbeSjAEpiKLeUoNJ3+1/+t2LcuEpOPvl4+nt7+fPt</div><div class='del'>-d/Pv13+U55Yt5+xzL2LX6kdZvjZFdE6AuXMaGdjVjw+bign1ZNIJAiEfiqKQzmXoTVk0VofRLdPW</div><div class='del'>-DdOZ+RtlDtPzDHjw4MGDBw+v0iPw9a9d5AtXN5w9cdLMT0Qj0a9PGD/3a1WxljMjvrqjx1dOnLNk</div><div class='del'>-yYmx09+2uOuZZ17Qy5AAFVB7ejMcN6+1LpO3Tjl9yRx+d9vfSA7uZuuWLcycM5tf3/Qr/vdPt7Ls</div><div class='del'>-idU0BgtUa1Dr0wnWVhJTFXr7hvD5FPZEguhFhUA4RntXksYJTeQNU//70+uTumEmhQdgEOhnOE8g</div><div class='del'>-RWlbYh1viWEPHjx48ODh0DwCCZ9yZrO/+jeXXXr9pKqKEIXUXlZu2T5/z9aO+XYoihahwyxEV3/l</div><div class='del'>-y+96oDFQvPPT//VAqgzZ8MWivudnTol88bmXNvG5T1zHlt3b2L7iJcxQmIa6OrSwxofOmcTcap0d</div><div class='del'>-O3tQ4wV2JeOs2JqjI6UTUX3kSdPYEGFKSxV5RaOpuoJk1jYLhuXsK+AcRfbfY8D2vAEePHjw4MHD</div><div class='del'>-IXgErr/+NN+ZZxx/cW2o9uYvfeUXkyoilfz59t9x5dUf44n7HuPppS+xdsUGtq3dVNnWsXdmwCie</div><div class='del'>-P3lC+F3vuvz49PVfOKc32RfLbt2+UxX3CFiaZs6YVtewr3tgbsfO7XR1DhAIRZjWFOWso6rxFZIo</div><div class='del'>-+QFmNoeIpXW6ckV643n8LY1cMg0qagNs687R2uJnXJ1FVzLFCQtmsLUtnntlzY6E8AbEhTdA9ghk</div><div class='del'>-GC4f9MiABw8ePHjwMBYicPTR0+c1jW/58UeuvmFORayJvz/5GN/98c+w0iaGrmBpAUL+AKlsBttn</div><div class='del'>-0tM34Hv6le31mXTvRX39AwuOXZJPNDXW7lu9plcBAn19af+s+U3jDNM6LpU0A7FIiPqqCA3+Ai3V</div><div class='del'>-Ieo1i/Y+k+lRCzUAG7pzTJs+k0/+5C9kuv9Ojd+iZY6fceMC9MUt+jMqjZPq6EkUs6vX7nLKBAfE</div><div class='del'>-0cdw+WAWr3TQgwcPHjx4KIuyew386EdX+mMx7VvZgr3Yp1g8/exSvv7VG+nc3U4iXSSezGCYJmYw</div><div class='del'>-iD8YpqKilmIBND3M6o1J7a47Np1z+517f5nMDPz2CzeeP07cR924uW9964TYroKtY1hFLJ9O1oow</div><div class='del'>-WNBpmBhkYkzhub0ZwgtbScUC3PFKN0mji5a3Xcnsyy5g3oXX074nRWVtHfG+Aq2tDdhK0CkX1MTM</div><div class='del'>-3znKhQY8ePDgwYMHDwcjAt3dxhmx6LiLE71DXPWpr/CBaz7InvZuApEIKBaTZ07ny1/8PO+6/BIM</div><div class='del'>-FDK5InlDozdZ4Jijj+E/PvVR0ml/y66N6nueemzrC28/f+71rZPqa9e90jZAuPaV2rDfyOYM0ski</div><div class='del'>-scYQBrX05TRCLS34/CpPPt1JciAA6SQnzTifX333V3QmZzO5ZRa5VIiCBS2tMdSiqj/39NI0pWTA</div><div class='del'>-MKUywaz429mK2PEEeETAgwcPHjx4cOGAZMH/+s9LfF2p3Cc/+aH/UCorwnzz//03mzQTFR+2ZeH3</div><div class='del'>-+TjqqKP4xCc+XfpCIMhtv/4jiuZH9YeYOH4WanACqYSKpqFYvfq4nu7erze2VCyoqFYee+pvrzx7</div><div class='del'>-2aULLnzmse3jdNNi1544VqVO+95+zrvgZIr+KjZu3cz8Ga3U1vqwIyHuf7yTh5f+O7oNV5xeT188</div><div class='del'>-QbUFOT1ndvZm88IDEBJEIO/yCFgeEfDgwYMHDx7K44AcgcmLW49OdiWvnzCxqm7Vhs3c89cnKOTy</div><div class='del'>-5HI6hlkgncmwfecennjyKf7x6FOsePFlBocG0M0itqWwauUaNmzYhG5bBLQAtgm2AgO9AzMSKWOh</div><div class='del'>-EtSGNEXr0FRlfjyZZ/z4Fr7ww1+T6OkiVtXIZ3/0fdo2rqN9zx4WTa9k7qwGlkyNYvltckWVaa0B</div><div class='del'>-YsEQuUSSqbNjxTv+tq2PUi6ACmymlCMwSKls0EkU9MIDHjx48ODBw1g8AheddsXZ0WBt6y//8hvW</div><div class='del'>-LN9MoWASAiojEdauWsPO9p1cdfVVrN+4htX6y2j+IJYKdTUVnHHWOZgFg2eXP4+d1MkXdFQtREAL</div><div class='del'>-8/Cjv1e37Nja8vOf3vZJxR7a1NxUu2+gPzcxm8uR7l9F04xGVjz9JDdPvo2GqJ/KmB8jG6K6MkZj</div><div class='del'>-pMAxxzXSOzFFsF5j1ZZBJk5SyeRTReEFyAkikBVHThAAQ/IGeImCHjx48ODBw2hE4Cc3XaVd+LYL</div><div class='del'>-JoSqJoX/8exj7Khowx8woGCTzxe48etfJpmLM9AziOozGF83jqF8hlR/mspINd/48udobJrM5798</div><div class='del'>-Lbf87n4aaqoIBjU6u3vp6Ehz+cWf5PKLr1XOeNviuYWCTUNtFe3tg1xz9VcoFC1Mw6K2QmNC2Mec</div><div class='del'>-JhszkaKqIUBOt0lU2fh1HVQ/Qb9KVLfsZ1btdnYWLAgi4IQGnPwAOTTgwYMHDx48eBjVIxBo1bRI</div><div class='del'>-S8C0bVYuX0s6kUcNKBTyFioqf779XoJRH1beIBgNc8edd9A4roWhgQH+/Qs3cNHF7+Gb3/gsG9bu</div><div class='del'>-RdVsMsUshbxFSINvf+sHnHP25dz6x9/Q2TFIMKKj6CbVVRHyBR9TJlSQjCc4urmCOTPriLZ3QNFm</div><div class='del'>-3/ZB1JxJbaKIokOxYJFOm0ycBq88mEhLHoHiCN4AjwR48ODBgwcPI2C/qoFw0N/Y1ds226eoGEEd</div><div class='del'>-Q7VIJQoctegovv/drzF33lSMgg8lEKSY1vnvb30fFYtsNkt3T5LdHTv40DUfZ/XqVdRFI1RofgIh</div><div class='del'>-qKqJ0tPfTWNzjM994WvE/DGUokVIiwIW2byO369yzFETmNTajGUX6asJEmiq4JLvnMlgUxhfzsRq</div><div class='del'>-CWHZNr6QRWR8hb11ezolBn9naeGMRAScigEvN8CDBw8ePHgYi0cg27+XwcEeamoaSfSmqYpVkSgO</div><div class='del'>-8Z9f/A9OO+VsVry8hu0b29FzBuObmli+YgUXXXwhHZ0DpJND+KIBogE/QZ9N0bTwqX60YJBCwSCr</div><div class='del'>-FxhXXUs0HAFdwSiYFC0DFYWKiEbXYJramI/taZPBwTg9PQOcP6+avuUa0XHVmP095NUIhpUiaVvs</div><div class='del'>-G8gUbOufA39WeABkEiDnB3jw4MGDBw8eymC/qoHKqoqal9avueTvTz0yZeuWvRTSefApbNy4nhdf</div><div class='del'>-fIXnnn6SVMGgvrGJv91/N9OmzeC2P92OpvmoigQJaBqa5sO2LUIRDVCxC0WKxQKhgEYqmcdPAFXx</div><div class='del'>-oft8+GwbVTUIh6A/naMuGqS9L8lVH/0wl7znVDauWEZi807uer6PigqFurog+AwCFXn2Zhha9kp6</div><div class='del'>-n/AEDAhvwD5KFQQZDlxQyIMHDx48ePAwChFQjjt2VsSXKp7bXB2e1REfwLTzhDQ/A939tO3rIJsq</div><div class='del'>-ENBUMokhCsUh7rz7AfKpDK11tdiajaqAiU3ADyFVQ8cmns0T0lQqA37i6QyqT8MwdVRVxe9XsJUi</div><div class='del'>-yUKe6roQuztzXHbpVbz9sg8wuC9D/IV/MPuEZk4PqUxqrcWn2eR2ZJi9JMDdzwzu3bFP7xYkIA90</div><div class='del'>-Ad2UygazklfACw148ODBgwcPI2C/0EC6dzB54plndFaEwHzuBQzbQjFLJYC1jTWk+uKkMjn8gRC3</div><div class='del'>-3/ZQiSj4A6SyKVpa67FtnURWh2yWnF4ka+hMn9LIdddeR2NdAx+74dP4ikWyKvhNA9MIUFsbQin6</div><div class='del'>-8CkqoaCPhx65i5eW3cHaFR3MmVbN4ikt+PUh8v1JNMuHv0WndU6YvEleEACnSiDv8gJYHgnw4MGD</div><div class='del'>-Bw8eRoeTLKgAylPLNhgnnXlF/gMf/iqf//g1ZFMGuWKA1gkTufeee/nF724mFU+RyaZRDIOa6hpa</div><div class='del'>-JzSTKmTYsn0PnZ1xUukcaRN0S8VPkAvPfTvv/+B1hKpNFNPADBiEwhBQFbKFPPF0CjWoEA5HGN9a</div><div class='del'>-z7iaGqZOnEBtUwU1NX5U20IL+gjVVxIcV4NeUFm1Tk9s2mkkGa4YMF1eAG81QQ8ePHjw4OEQiACA</div><div class='del'>-MpgsYuTTXZFwde708z/M5KkzCUY08IOl5zj15JOINVTjC4Vobm1k69ZtLH/hFZYcdzrRiijjmuqY</div><div class='del'>-Mq6eaDSMYhoU8ln+dNufmD25iUsv+jCKZjB/RgPXXHYsJy6sozqskMlYZNI5hnrSFAZz2GaOzi37</div><div class='del'>-uODsKSxZVM9QKkC2pZreXI5cPgOTi7y4PRXv6Sk6ewwUAD+lbYe9nAAPHjx48ODhEOCTPAIqoFWY</div><div class='del'>-2/NBRTnn2eXP1z79/DIKuQLxoRQvLn+C559fwfatOwkHNQrFHDt27mLnzp08ev/91FTGaKxvoKG5</div><div class='del'>-jvraBqZPbmF8cxPxwSLJfJG6qiATmmOcf/ZMaptrqauw6e0dpD9hoGkqOV3ByhWIBFWKFqAomDZU</div><div class='del'>-+WpYsaWNtGFCJEl9pWWua9d6Xl6b6hGDf0I8/z7hFShXOugRAw8ePHjw4KEMFMkz4ANC06fX106Z</div><div class='del'>-WP1Xf+34RV27EwwmMxh2nrAWIpcYQotWYOYNLAVsw6RY1ImEfdiKn0goiM9nEzRN1HAIyzSpidZR</div><div class='del'>-KKTpSwxQFbSpqNQ49ZQp1FWGeGZZGys2DBALB6mKRqitrSSR7sLIm6iKTSiiMHdGC3ohy8KjGojW</div><div class='del'>-J8n3dqeu/0H/BrNodaDQVVet9Q8MGQawXBCDOKWqgTxvrjJCZQz/L/eM9hivbf8LyePB4BE7Dx48</div><div class='del'>-eDiMHgHHG6ACgcHBrO/tpzRNam2ZcPycJcexafsOIoEAuUSSU885gU985NNs3b6DgaEBPvC+d5JK</div><div class='del'>-xclkdaqiUWJVEQKBIFUN9Vx3w/WcftKJPPDw45iWRUt9FYZdoD9lsmFbN1t39JJNm4R8KroCM1pb</div><div class='del'>-mT13EsnuPnL5AnPmzCRQUUGoLkIxn6VnMElYNenNmpmly5M9VVHF/u8v1R/zH5+se1tTvd9q6zJ3</div><div class='del'>-xRNmmgMTBd8MBMAnDk0cfunQXP93fveJPlFGGPzkflNd574VCYDP1Taa6/C9Rd9R7iffW7yf/i9N</div><div class='del'>-kP6v95nien/VE4t/XWiujlcAZeve+MNfeMdRn6yacQUdW/fwzOrVWKrFtR+6hjNPv4S2rm5u/f3v</div><div class='del'>-+NRnPsPKV1YTrTYI+YKotkm2YBKJ6OQGE/TaIdJ6kaKqMLW+idaKKpKpFJpRoLOrwGA6hS8QJRSy</div><div class='del'>-SZgFdnf0EY5V0xwOsPi0hbTvaSeRjpNImQSDNsFYJc1RK3r+WRWTzj9JC4QrlKZ1G7KcuDjyjunT</div><div class='del'>-IupPbxm8de26tMH+CYPu6gH7dVYmH3AKMEca7BSXYVFcz+dsknSv8HDIng1ZSWcBpwL9wD/EOW+1</div><div class='del'>-PAnH2LwTqB3F8FrAKmAtw3tJvNkTQp1+mgycDaSBB0T/6Ly5l8BWXHL6fyXM5vTZROAcSt7Ft0qf</div><div class='del'>-He42WAwsBPYCz79F7YuHQyQC/zTMS1/s7Puvb9srjp2/8Lieyy7gmdVr0FG46abb6O3Nc/ttf6Kj</div><div class='del'>-t58zzriA6oZqbMtgIJslFo5SXV+Palrccdd97O3upiqkodsWQ6kcqh6jJ5HDZxrsyxSJaSEaakP0</div><div class='del'>-pfLEU1kaxtex8MwLiPd08vhjLxHvjtPcWEtlTSXHz6vGsIuEw/7gzKnZ1gGfppLx0ZvIkDZs31mL</div><div class='del'>-w2//xnWN7Zddl76H4fUDTMlD8EYMGqpo4w8CH3oV339FPH/aZYQVcd1TgJvFeS9SCoc4+y68FZTV</div><div class='del'>-MThB4FvAtIOc/wNgt9Qe+luACGjAEtFPu4ClUj8V3qSDq0NgjwECwDqhP/8X9u9w+mwh8Gtg51uk</div><div class='del'>-zw633fID7wBuBO4TMuC0gY1XlfUv7REAsItF9L/e9re7p4x/21H+UKpCKSpUKBGee34pfsXmo9de</div><div class='del'>-w//7+c84422n8dtf/ZYrrrycjWs3EQwGUPQCuVSOnAKVsUoKhTwUdfa2ddHDIJlihmAgiKabZG2V</div><div class='del'>-TNFPZX0loYhGZyJPavlKtq/dgWIUqa2K0DuUptgxhJlJc9yiyfQVdKxQgzqU8LNjWyfVDZV0RTT6</div><div class='del'>-k6p/75DeDEoN2M5A6Mwc34h1BRRJofYBK8XvsqtthvjZRym/QfYGWEAlEJM8As7g7hMGOiju5Qca</div><div class='del'>-KK2qaLve961gdMOS63FAtIfbS2IJQ1QjDUpv5r0k5P53+snn6qc34zLYDgmYBawQ73CW8MQ4a3X8</div><div class='del'>-qw6Ecp+FJRv5Zu+zI9EGsn0JizZIiHc38TZz+5clAvsZ3bse69v2qa/PWH3eeaeceuYpr/DCi6sp</div><div class='del'>-2jbf/+EPmTxxCr+77VY6Ozr5+U2/oKOzi6r6Jux8moJexAyESAz2U8wXMAp5bJ9N0YTmCa3UaY3o</div><div class='del'>-CtQ0RDj3nPOI+qPcde/dJPoGMXw+lGKQgqET80fIZkyKuUHqmipR0j70gsFL27vxR6qZMXchSs86</div><div class='del'>-ioTQFJv+3qHss892KmDPYHgXQnngVd4gpfIBfwT+DjRScn9XABHg60LJ1guj6+ybkBGGxwRCHBhO</div><div class='del'>-cBTVMVYBYJz43NmW2XiLGB2feA+ngmUN8KwwNEXpyFBaTjos+vWtELd195MmZEAVfZR/HfpJkdp5</div><div class='del'>-LLkziqQzDtGKCEIK//prdDh9FpL6bNzr3GdvBp0MSkQgJIiAzXDJtuNt9fAvRgTkmZe5b293/J2X</div><div class='del'>-X3H7Cy++2PiJT94wc8+W69H1AK+sW87qVWsI+UN0D3Zz25/+SFEtYOVzKCr4CIGRpzISIDq+ldNO</div><div class='del'>-WUx1NMJgPMX8o6fQ05ti9XMr0XwKm1/ewMZNG2nv76CmLorPX0lBT+PDRzaTxB8KEjJt4okM2UyA</div><div class='del'>-1Ip2wg11ZPIakUCMc088w9yya6teUx3UN+ztXnf/Y/E1lNzGC4Ct0gDyRg0YtjRDN8TzFCQFQ2Lc</div><div class='del'>-FZL3wjnPnRvgdt35pX6sFd9JiXc2JMPNIRhud2zY/S72ETI6qtQWMfYvBXXITdE1IyuXQEkZb4L7</div><div class='del'>-cw6hTRTXYY+xPf5ZkuvyCNQIYxpnOFmXEd6j3LMeyjs4+RdVwGeA70kzOjlkVq5PeoELRF/0A1Gp</div><div class='del'>-H5TXSYYUV5+WuxaHUSZH6rM6IXvJV6lbh7s9lCOslw4ZcuxLUNiXvLAvOendD5UUjvYOh8NOjVU3</div><div class='del'>-D4d+Qfl8r3KT6zc1cdbKkQBhfIsrXl7VdfzipluvueFzV9bXF8fnbX/Nd278f4qBYfpCPiOZydqa</div><div class='del'>-qioLpk9WjIqIr7WlSZ1SW62Eq+uZPL6evniCdWvbGDSzbNi6k+62NqZMnkBP/y4sxUI1bPqSQ9RF</div><div class='del'>-QlTYEQYHMyghBUvxU9TzVFWomNEgKd1HwIIKK0CNoVLXZLBhxWO5l9Z2de3c1NUO9ACdQkELQJsw</div><div class='del'>-XDNEx7S9gURAF4oTlxh1hv3j25Y4Z0gY4CFhdBKC2Mgxf9kroEnGKiaUNCquBfuHFA4W25WzhH2u</div><div class='del'>-QUoePA63O1513UsRz50SA5C8gmRa/O3MymzXdeTqCdtFGORMcHlmO5IhUw+hPUa6hlwx4vwdEYZ1</div><div class='del'>-JBKgSt9zv4fcT/Jn1ghkUQPqKSWdAvxW0pHRymude/SKc91VG8pBiN1raTO3LKqu+youWzUW2T5U</div><div class='del'>-uPssJmSvQtKt4hh1S5YjTXoX5zvGIbaH5pINc4zXeDUeJKcN/JTClI7+FSU91cd474PZl9dqp9xy</div><div class='del'>-NlLo0G0nLEmeFJd+jWYj3O2kliEnR9JuHnYiILMnuRELQP6VNYPtKz9y4z1TWqtmaeGKCabuq8rk</div><div class='del'>-c8FsJhdIpzM+y7a13Zt2aSeevCR86VknRkLBCt/GTbtI9g1iVqi09/QRCAYIh2y6BjsJhkwmNtfy</div><div class='del'>-8totjKutpToYJGcUSRRzWLZJLp+lsT5GTyFJPJVB80OxaKIE/BgGWLaFrRd56omt8e6+TMrVgc7g</div><div class='del'>-a1BK8tGFAM8BNrzOLj2nPXUx8JvCiCTEMxUloSgIotALtDO8m6IzABbYP/nPPaipwARKCYnzxN8v</div><div class='del'>-AN8QnpG8azZdTrmcWP3HgauA6eKeK4H/AZZJbsHDHSdVXe2Wk9pjSGoDwiiI+AAAIABJREFUJ3SS</div><div class='del'>-d7WHYxh+AhxPqYLix5KhsgVBelC4Ob8m3qdc9YE8K5wAfFrMjCeIZ9gK/BX4iyArBYmoWaMYLrmd</div><div class='del'>-3eEqx6g77/ER4GrgGeC/pQEb4LPAZWJwv9kh7a4ZqvP8TeJZF4t2e0QaPD4ObBFtqrue3RaycLu4</div><div class='del'>-zueF3I42u3Hu2SDa7GJgqrj2DuBvwK2iX/OjtJljXN8mPBj7gO8AX6CUxR+kFEb7ptBpt0werlCK</div><div class='del'>-3GdNwPuEp9FPKTn3mwznTRRG8dxpwAnAV8TPqJi03Af8rEx72CPoZj2lhNoLxe89lJIYf8twIt/h</div><div class='del'>-ShJ2t0EUeI+wLXWCoD8K/FDoqBwusEYh+5XAJ8W1pgrZexn4EaWKoIPZF6c9xwv9OEHIm3sWfhml</div><div class='del'>-MKLjUUTSL03c70ShP/dI+qWI9pwDfBd4gv3zzOwyz/K8+P064HIhJ41i/PmZ6Oe89CxvyrCaNooL</div><div class='del'>-Oy8YYNiG3l3tCQUScaC+qqqiNp3Jhi3bDsdqQlVf/vJ7J2jhyf5YTYVSyNkoWpHBoRx2Joxh6vS2</div><div class='del'>-dZQClKZGciBDVjexfQGskEIxbZNIFzC0IgEzgG3l8BuQ01XMYo7ZE2sI+jUi0QDRsEJDJaBbnHv6</div><div class='del'>-+Ni9f98Zz6RNdRR3U4rSroRB0fGbKCWiFV+n9rWkgd4QbZoV9/e7iEBKGIUBoWhy9r/MuMu5oarF</div><div class='del'>-AGEJwzmVUrnaPOASQS5S0izQLmNoYsCd4nuI5wgBp1GqTviEGEiS0rMdLoMjow6YTSku2yp5RHTg</div><div class='del'>-OfEeZpnB2y+MyQ1Ckf8q+jorzv034GRKO1TukWY47jCDE3Y5A/hf4VZHXCdKqQJgiVD4j1AqrcpI</div><div class='del'>-XoqDDUbqCC5vOUlrirhHlwgl5MT1bUHQlgjjXyPu7ciQ3B71lMreFoj/RYCjpOdoEQOSXaYN5KoB</div><div class='del'>-xDON5g1w2myRaPcm8f+80L354vgA8GFBptLivdxt5lxrnCAwk4X8BShVXUwXJGGBkO1dkrv6cJEB</div><div class='del'>-XIPgvwsd2UuprPBUMYBcKgx+ssz9nTacBzzp8r5OFGRpDvApoffpEQi/kxj8Z+BM8dkg0CxksFJc</div><div class='del'>-K+my4xxG3ZwjDscWNYmB+AzxDPsk++LuA0UKiT0EHCv+3y9k8mzgdHE9R7+zZeyUIxcnAvdLeinb</div><div class='del'>-+z5x70bxHEnJ2yC35WwhW1OE7cxKXo65lCpGJorPMuKQ29UhNmGhiwiSO0OMMT7RXr8S9/ubINLZ</div><div class='del'>-w2Q3j2hoQHZV6ZILOyDFcC2fTzHy+VzOsqzogoUTpl72nrOaTznp9MC6je3s29tB92Ce3r49FHMG</div><div class='del'>-GcvEyPuIVUSJBgN09w6Ss03GVVegtzbR35+kMlZFfeNEOvq7GewcIBIOkrTyzJvRjOLTsXSDwe4U</div><div class='del'>-0aBGJBxhdkOYvA3HTAtVvH2xPeGnt+0rvrCpMCTNtHwutyJC0ZYLAZgAbJZmOK8HGbBd7i8fw2U4</div><div class='del'>-MJwX4BCFnGRY7FHczjIReAV4WBiJIPBVoRBXAb9j/3JKs0w88N+FUvYLpt8t/n+WYPDODEh1eTvs</div><div class='del'>-w2x0ZomjHN4p3s/t0naMxFIxeDYL78gfGc50/ri4xt9EvFORZtOm9AyaMBAOCVgpZsZOouJCYfyO</div><div class='del'>-Bn4OfEzMiuwRYpPKIQ4+QdHuCCI2TsivKg3KzgDVIGTJcLWH49L9AnClMLIdghhkRB9nJVd3wRV6</div><div class='del'>-Ul22IcKBSZqKa5Y1TngpmoR+/VHMWoOCgHxADOq/Fu3XI3l/3OEbOcGyTnhG/iyes1J4uhoEqfgf</div><div class='del'>-DqyUOZwENSo8D/czXM3yFfG+1wrPU7n7O+3SLN7xj5SSgh2SeQVwriA060YImTiDV5MgAQivQJto</div><div class='del'>-nwXi+WqkCdzh9NY5bWAI3XpF6NM0qT+/Kg6FA9dtkQffbwgS0CFm5IPi/xeL41tCVtVRrhMUg2sV</div><div class='del'>-8JSQ5yrxvTliovKEkOuYy0uCNHg7sl0p5MhZjVaVdKdakGmljL1x7ETEpSNfErZAAT4qJh43CA8W</div><div class='del'>-b+YQgeryCFjSoJQTjZMQndYLdFuW3VEomG0zp9emv/XFd804bsH8yKZN29i7Z4j1G3aQ7eqlkChi</div><div class='del'>-KAqBokkxD6lsnJ6+OG17d9Ld3UNjfQP9Q3mKpsbMRUdzwXnncsxR86htaaB1/ASax9UQqY4SiPip</div><div class='del'>-jgV51+WnMG/uRGa0tBAOmdRW+QiGkkxtKVR87MLg5KooMYazXB1D6iS7OATBFgYqLQbHE9+AMIE1</div><div class='del'>-wmDsjnkeasyvW7BpR1mKwuWGmKU1CKF3x6ZVSaCvFf/7X6FA48SAuUrMhOqFMaoTxsfPkVltLCsM</div><div class='del'>-bpcweHvErG+HGBhjrvdQXKGS+8R13i1ciOMEmZkl2uUlYTgjDFdjlCNFVeLev5VCTH4xKPxa9MuS</div><div class='del'>-EdpEeZVG110W6mRrV0mDcUAyPPVSe7g9Y0XRhjmXjOUlElzuWeXBGMlgVoj/+UbwYnxUDHr9wE1C</div><div class='del'>-zyrFZzuBX4p2nC5ct3XSNVVGrojpEwa+ShhnhdKaGQgvwzjxWVAy4ocTCeBxcV+nkkC+v6NboRFk</div><div class='del'>-MkVpHZG/iz7xCXKZF9c4WmoLt07JoSQnNHScaOeI0PF7xL0PdyWNfJ3tIozkE/fZLvoEQWYmjaBT</div><div class='del'>-jkxXCY8cwG1CFp0KqmVCZqaId3Ou4yadTkhgthi4b2c45+p+ce1LhU7I/eGO5wcZToKMSToUlp4f</div><div class='del'>-8czlZFQZgQjcLf5fI77zrPj/dOF9G8nmvOk8AnJygy4JqjOA5YCMbZMAort2D8Zvuum+EMHoArTq</div><div class='del'>-xlhFTTAYqwlZ4aBqBmIECjr4w+j2IPHuDCctaiaZ6megb4gn126kp6+HgmXw+IMDPMk/0Px+IrU1</div><div class='del'>-DA4OEK3wEw7ZoMRY++IWErkUQcvHoklRIpPG0aAZGH6wdGiZMaHqD9/WFl/71eWZwYzuxJAdN5s7</div><div class='del'>-flsAtonZyKVCEB+T4khvVeiSR8FJRIxLRrxa/J2QPA24ZsBNkmE6Who4ZDmZJ4ygkz1dPAIxr22U</div><div class='del'>-SgiTIj8gLe6VEuGKcBmDKTPsf4iZYqMgAEsZXszpJWmgUUZwh4fE9xDkKsxwfkdRfH+HOGaI0Mkq</div><div class='del'>-KXdBf5XuaXkmrkmz/5jUBrb0WVB8Fmc4CY2DxPGdxNW05JovF7f0ScYSYdjCZQZtJON6rvh7mTjP</div><div class='del'>-krwNDjFZJ1yyp4gZXdb1DLLB9kv2J8z+24zHJUPulu3Dve+G20NaFHJZ7v5Zly1RhJw0CHksiPeZ</div><div class='del'>-JfVXlRgkBoXMF6R3cGTCEAPNlcD5YnB5QNzT5MjU9duuccEJFSfEO74sCJ2z+NKgK0RjSyG7+YIo</div><div class='del'>-26L/NZd9ce51DLDRFR6wXCTZOb/Kpce4bIO7EkGVPIc+iWhXSKEdWY+cSq5QGf1yP49jI/0MVzsN</div><div class='del'>-SMS2SbSP47kuvtkGkHLrCFjSQCHPVJ1krUzQT+3Mqa2R1tkL+9OZ/Cpd97ceNW/q5HA02jw0mFcD</div><div class='del'>-4Xrad++lvy9JeiBJRs+zdNVmEv1xIuEIA/t6wVaIRmJMbx3PULyP/v40RjpHTUWIQCTMjMnTCFdX</div><div class='del'>-sW3rLvwBjektk8jGh4iNG0+sejKq9hKmWkVH90zqihuqfvRvcxZ//i/rCgOJ/Wp9DZd73ZYU+U8i</div><div class='del'>-TPCvAFsYqSHBrnUhkI4gyrNJn8vQOAleDk4awRjkheFzst61I+QRsCXj65CbkcoH5UHPcY0OClfy</div><div class='del'>-ecDbhSfrBGkmp43gRnXaIiRmAjBcepoW7eq4D6uFF2aGOLdK3DfBcCLjq4Uc0pJnMD6X29/9mXsp</div><div class='del'>-YJP9kwwtYfCcBZscw10uLq24ZteBMt4AN3mqF/9LSzPhfvFTFW3UJc6pEW045BrA4cBEWMelmpHC</div><div class='del'>-QhlJtsMc2bUlbKFLcfE+Ben+iku3VBfBdGxpQUw63ivCApbUvmExSIbKzBZl/btFnHOJIAKfopTT</div><div class='del'>-cxeHt2qgHBkwhez0S/bFIadRoQMxye0ue0ScfA+nvU4bxb5Uu+yL4pLHjPBMzKa06uHz4tkuFNfY</div><div class='del'>-xXCCsF6GICkuGfZLOqS52t/vsnMjec7kd8lLYQb53ULsXy2k8iZLGhxpHQE3G3TiwcaPvnr2cUtO</div><div class='del'>-PePDXXuTlZZWMW5dW0bbt71d27StK6SoATq7eglHwrTt2kVQUxhIDGFYFhWaSkV1CAubUDRKnRak</div><div class='del'>-qqaSxdOaWbOjSG4oQ1ApYBs+zLzCylXriDbUUNNchV6wMRWdoxZNJd25i6MWRkgOhUm0F5g6fQZW</div><div class='del'>-KkdTvGPc9Wc3z//eA91F3bCLLje7XYaBmsJl+VZeGEUmb1lhVAcYTkx0s1V3qY2jGDnp3D+Kazmz</div><div class='del'>-fkuSk1SZGOqR8G44RqdXKFZWeqZySVWW9M7O2vDnCoN5lVC8XdJA4lxPzrKWZwxpMXDVivMTYvBM</div><div class='del'>-SEQiKu5dEEoeOgzhknIJhHIJXbkyqJHq003JIDrGPCXeIS7NgnRGT0Qtdy+ljLFPS4O8k6jVx3B+</div><div class='del'>-Q1Fy9+ddbeZzzezc7+TUrw9JYUvnPeVNqg4XEXDPJjOSbhUlku3WLbXMQG6KsMmnKSXV/YpS8u53</div><div class='del'>-xOCpCRKhcWD+hSPbzj3vER6zy4CZlOL0GvBTjuwCW47sOCFiR2ZCkg6EJLKoumbyWek6v2P/NRlk</div><div class='del'>-L1fC1f/lBt8fAt+nlDD6NldI8VGG86tGypdQRtAv98A+loXoFJfdSgsZTbnGVs0lo2O5nn0I9uI1</div><div class='del'>-n68dhAXKxMA8dv7kSPPEJR9du7Jv4fq1m1m9rY1Uqki0pgbDgGhlhFR/gh7DpKmpjnwmxfSJk7Hs</div><div class='del'>-HP2pFJXBavr6+2hoquXUJbPZ3dnLI39/jtraCJe/fTaZlMIr6/aQSiTRjTy7+nuY3NyEVh+lI56n</div><div class='del'>-89l1bNywk/e+sJd/+0wr1aECe++9lZaTVWqOrdbmqqHpnwsGtO/9Za/J/vW2spI5BsvJEjXeomTA</div><div class='del'>-dv1eYHhVQkNyP8mDnLtkzTmGhNFuEGGBFey/sp9znRzly80Op+GVZx/dwvg47ja56sIq872C6N8d</div><div class='del'>-lBIbFzCceLhWvGtWcj0WR5gxrBfxyIUi1leU3t0nPpsrvrOb/ZNUOQzuaV3ST58rXOBzzUiUEZRc</div><div class='del'>-Tk5FknnHszJa/bdyEIJSbma0Xrh2F4rwjNNmWfF5jXALQyn3wt1mlPFqIHnxcpJrvljm/od7ILRH</div><div class='del'>-0K1iGd3yjTJrPJnSYk69wJfFYFntIlm+gxAJXSJCO4DfU8q0v4BSLsydEklWD1N4pFwf5CX9P048</div><div class='del'>-sy5CrWoZT45jX/aJ9otQSupby/5LwDuJhhlXSMA9ITUEoX9AEHyTUuXLbhGq6JE8FfkRbLst6VeA</div><div class='del'>-/Xc91Tgwr2Cskx6D/VeGzZaxK+ooBEcmIzblq3lGknn30vSM4Xw5iX1EduJOHjQBs6m+3pdNFRcu</div><div class='del'>-XbaBp1ZvYsbR8/mPGz+HP6yiGwW+8Z+f4qc3fZ9MNo0flVAoTCYTJ5vOMmlCK1e86x1MmTuB9t5u</div><div class='del'>-nnxpFVs2bqU6pnLKMeNYMG0ypy2ayfHzWgmE/ERiYeqrq7A0H4mhPOmMQayqlauv/ywts1rYs0ph</div><div class='del'>-3Z1DbFq5j+7nOgkMhGkK1yonTmue9N4T6uZRSqhpEsc44b6qllxYAQ5c2OKNGshHi+uO9RqGyy1W</div><div class='del'>-rj57pJXNdErJTAg3+mxJsDNidvxuMfiVcycfTviFwXAyf50Yaq342xyh7eSZU5JSqRKSJ6NNfJ4S</div><div class='del'>-xiI/QpjBopRwaAnX/8WSvAQolTR+X7j5eoSr0hpFCe1XYXx3ib+nM5zkGRYk7bQys/TR9NcxSA2S</div><div class='del'>-6zZIab0F7RBn0vYo93pQtG+zkBUnySpIKT7+XaF/SUo5IOUWarFHMbJul+9oxOVw66fpegbzILMt</div><div class='del'>-OaFMLpcLCU9SwGV7RyMTTsnod4UsxIUM75S+O47hBLkjkYzml54xRKl88tPis5Xsn4dllZGNPKVs</div><div class='del'>-fsR3p7F/vkoNpWTCycLeyPbFHWY5HrhGDP6/EF6SZQznE8VHsVHOtXaLv+cK+QwJ3TiPUuk1jG3r</div><div class='del'>-Zbf9dcup+7yRSIBP2JVfAZ8TuhMcoS+d86dTSmT+6EHCtc758wWBfH+ZMEVZj4D88DJDx19VoTRM</div><div class='del'>-nYzx0k6SOYtTzzyND3/o44yfNJkPXfVB/nDrX6mpqEYxTfp7eyjmdKK1EWx/gIrKaqbObmbK7skM</div><div class='del'>-7O3Glytg5guMn9jA+OoQvnCSUKSK9vYEhVyBQMBCqYphqyqpbBpdU/neD77NwqMXs+eZn7Lijz9n</div><div class='del'>-+tsnsFgpkOiqIbPDRKsPMn5uk/qubOGoXQOGtWJ7wpJcVDajL/n4eu7WZ48SkrEPcdCQZw7lVsIa</div><div class='del'>-6dpyLLlIKRnpJKGk54tY5qAwXJXiOy8x8mp0r3XW4cCp0y+HRyiV67mrMOQZQ04YgpeFC7aVUqZ/</div><div class='del'>-TnKNlwsvyCWRmyhlN39QGIcTxEwsKEiSJgbY2xnOnRnrQksjbYst98cyQTIaKZWqrRHG+ARpNqoy</div><div class='del'>-8nKmMut/UTxbhbiW0yZrhRF3zjUYeZlXawTZUaQ2a6NUTXGDmAUvEG5sp6baL867neFExbEssjJW</div><div class='del'>-2T6S+jnaLqYj6a2T+LlX/H0UpRyBXjGbdkJLsyjlV/ygTHhAHjwuohQL3y5kb7b43Ll+hPLJnIfj</div><div class='del'>-/ecJ8uuQGSenqFt4fxxvXZEDyygd+3Kb0OsWSvH9c8SgHROyiUQmzRH62RTPYAnScJrQy50ML9aW</div><div class='del'>-4MBEZtv1PA8JsjqZ0u6Km8Q7HSO+F+LAvJuDwXoVMiLLyVcYrtzaIOxXhgNLkp1Q3HcolaB+UNiH</div><div class='del'>-7WXOl0N3PxKhlPcLve9mOMHZ1sYoGCrgq62fqS1YdBHFmx+kqibCL396E5n+3Tz+1CqKhSJLH3uC</div><div class='del'>-pilNhEIaOb3I1NlTiad6KORsVr+wgq0bNlMZCePzQc9QnFg0yOrtHazfvoNIUCFp+IlEapgybRpD</div><div class='del'>-Q0MkU1lMFcZHK1CLWW7+9FVMmuBnMNHDcaEo+qBKW3c12S0DTDpHwdZ8pDf5aRrXHPjSxxcv/O5v</div><div class='del'>-/sbLW3tUVwxPTkLxlelM63UgAO5FP4wRlOhgA6jbdadzYBaxNUq8zJYGz0FKK7ldLVh3UMzuELHR</div><div class='del'>-Rykl5xyJZKyxtnlIzB5sDkyQsl3hgUFBHD4oBsNB8R5ydrddZsBxvn+fIA6XiVDAYmlQWCEMoDML</div><div class='del'>-kaso3EtByzIl95M1woBriGt+h1JdcotQ4DSl0s4pYqB1G5+RBtA+SrXunxDelSrxjtsZ3snRdJEq</div><div class='del'>-u0xIoVzylbvNHhOG5Z3iORdKz7lWyFAfw5tqpcfYZrpLtk3XZ4ezdr5cPpG8nLDpIp+jxaJVISuP</div><div class='del'>-i4HvXPG8TmXFZEEKHna5puUYuypI4Z/FADpTukcbpQWcRssXeS3vv04MslPFjNlJrs6L93pS6EiK</div><div class='del'>-AxcCkol1VrzDtylV9CxkOMkT8dlDUviOEbyZPuFV6hRk9lhxOCvJ3i/CEKN5DXURmvqxIK3jxdFL</div><div class='del'>-aSXAyyktJsRB7PFIOmJIHiQ51KePIiN+QWgc72VRTL5MSbZM1/nbxPnO2hYxDlxa2Rm7A5QW8Xqb</div><div class='del'>-kJmQdL4OWGMhAv/shGw6rTXUBqmtUynuM8llkuzaleLyd76LhoYWVq1cxeXvuIhHHnyG7q5utu7Z</div><div class='del'>-Sm0ojKr4OXnxQsLhED2JFFs291NfXcsPv/efhGJNbN++ll/cfCvptm58/hiB+kn4DYtowSZkmKT6</div><div class='del'>-OpnVWM1ZZ53K9KNNtOIghb0p0m1tBMIBqhcpGGmDrBWjf3cHr7S1ceJFReV9Z7fO6erp19vjpjxD</div><div class='del'>-UlwdYrkGZF4HMuAI5CXC0Ackd/VYPBPOQHi/YI5VUhzVMUy3C0WNSbE9owxDdojAkBCS3wulHC/u</div><div class='del'>-NSgUNTVKHPe1wGmLDwlXfDPDayE4jNWZdceFgjjJfsoIA2lWvM9DDC/ZnBDKnhzFbWgyXGffT6l8</div><div class='del'>-cCPDteq6uIbz3aw4b1Aa1Kwys4QnKFUwVEsuUZ0Dy6ec2VNGzFJuFIY/SGkhlqJg/w9JcevCKCEO</div><div class='del'>-pw2XCgM5Q3y+UxjTqBTPVFzfjVMqo3R2tXTnZrjbzKlIeElcv16EcwxhrJwBIifabEDyzIzUZhcI</div><div class='del'>-sqJLsq2LmeNLEqnJcXiWb5UJ5dOu+2el+z9EaXGdcvcvF676sdBFZ50FJ7lugpCdnWW8PHJ8OiNm</div><div class='del'>-dHcKd3aTRBizjF4K+mrbwSEsXYIITJDsVK80iDj5PEPiWdybgsn6uIfSsr6Nwu45qwH2CfuiUL6s</div><div class='del'>-1wmzfEEQWsdrV5BCT7OAL4r++h+pPWTyKpPWZ8XzTBeft4tzfi7ulZH0q5ytcOzWGQzvKCpvlDYg</div><div class='del'>-yJ9TTeNOTna77u8V3h2nyiTMcM4HHJjg+AfhOXAqm8IMVzW5k3k1SsuvLxf9EMJVFukbAwlwanr9</div><div class='del'>-c+fOrX7v+67+WHu8g7XrNuIrKHzq3z/Nle9+L1OnT+ahxx5jx+YddPV0o2katmGiKgbTp7dSV19J</div><div class='del'>-Z18/8fgQvb0JDJ9FfW0dPttkyUknEYxUsXnTBuqbJ2BhEu/vIxIJ01xZQ9Yq0lBXQ0QzWfZCH7kd</div><div class='del'>-eyh2DqD1FzHT4G+uw2xoIZQpcOfLXdy3ehBfKMTsea3+iRX5yu6+QmEgbbg3+SnnbjzUnfpeDZw2</div><div class='del'>-lRc6cga5IVd8a1QPjTR7cDJWE+L7ukuhndhZuQ17ygm4IT1PWhp0ZNf6WJfUPVhbOAw3IIWqHGWQ</div><div class='del'>-Z2Kj1cCPFKt1XIkpyeDEXaRoLF6XnNR+TsKdYwB7GN4caaQlYh2FM1x94X4OdwkdDGciyzsxZsQ1</div><div class='del'>-+oTBGYncyJuiOEtuO3s3OG3pJFbprlmoI5+WdL94mVlfufaSS6kSUps5a0H0Sm2WP0ib6dL9ndmS</div><div class='del'>-Lc20RpPtVyOPo/VZiv0TFd3PlnN5N+REtKLUfo4+Of0XZ7j8NOfyVsnbIjsEOSn13aDUnvFDmEyM</div><div class='del'>-1e47Nf8Z6RllGewVOjAwAhkuJx+6ZF8yUnskXaE7Z2KmCRL9J/H7/1DKzekQM93l4ruzBHG+j+Hy</div><div class='del'>-43JLHstJeU4VjVyu7Oic0z+pMp4rec0PuWrLKSGWJ50Z9l9rwijj6g9JfeesW1JuXxWfdH5OOj/r</div><div class='del'>-Ii6W6/pB8bm8Ed4/yYk2BoH45+DT3rbXBDadc9JZR93557/SmRri05//Erf8/ves37ydbHwA/AFm</div><div class='del'>-zp7JrbfcQsu4Rs458xR27m5jx869aD4/waBGJOLHKir88re/x+8PUhGoJJVLoNh+ahpM0okh6moj</div><div class='del'>-7OvqMhNpTQ0oAWX15h6eXbWLXO8AlfVhJk+fQmNNgHcvCJDPGKRWtvH7R/bS74uyO7mXx/70Gza/</div><div class='del'>-8iSzZs2uvGygOO+36T57IG04jSIrvHtXM/0I5wzILNkpZ3NK+JJjIAGySzIluZNMicXKm0clJWNW</div><div class='del'>-jgS4r2WI6zgJK7LBS4wwgL0Wb4DTFgOiD1KC3fo4cI2ADPsvilTO4Diz6rTExH3STGC0Z7fZfw0G</div><div class='del'>-R8HkRCykmXZCGgQO1rZOxYrcT0aZ2bDT1v3i3LTUHpbUHg4ZGcn4yySwT7pWUPq9XAmh7M4dFNdW</div><div class='del'>-GDmj2+1VcoxYJfuv1KZLxl4mQqaLgI/UZk42tkziU9K7HI4BsJw+jPX+OZcr2ZLk0OnLBAfWxzvy</div><div class='del'>-MET5ZcVNiUT5GS7l0yS9HhJ9dTj1siA9rzNwBxmutMpLBEkmSeU8RnJ7OhUQMYYX5ClKg6Wb0Dl2</div><div class='del'>-2rFHlniukBSO00WoCymHIceB1QNyn/RJ9jHoyqsxpJyDVBly47bhBclrJj8TDJe6yhVdliuXx5Ds</div><div class='del'>-vy7JhDtpUnHZTE06Z6QF3mR91qT22C+UqY1BMf6JbbvWG08svWXXth1DR+WSKcY3NtPX28Oqlaux</div><div class='del'>-TINIOEIym6MiEKKncw9de3czadIE2l/qYsb0KRiWQvuedlRFoaq2Cl0PUCiYFIw8gWgYtQBBzSaq</div><div class='del'>-QTybpbOjy5wyfQrhqOorWhGu/tCHUI0C9f5ervrct1i/9D7W3/I9zEgF9z3fht0S4TPvv5KBpM74</div><div class='del'>-BYvp2beRRDHBpEVTKs9V1Vn/+2hHTmp4gwPXCHcnlxypRCSn453V1xTXLPhgyVOWNDMxpEFTFkBn</div><div class='del'>-9uhj/1LA0VzitqS0YYk0mRJrzx2GmZf73vLWrkPsvziMmwxkJTexNULszpAMc06a2Y20k1i5tnW7</div><div class='del'>-NeUlbHUp3JJzxf0ZQQkN8V6H0heO0Qyw/x4PptS/uRG8AZb0/rY0k/RLf2dHGNxl+cy45MkYwYsk</div><div class='del'>-t5kTXnG3WYH9d9Q0xtBmmitPwJJmb7LcH65KFpmMGaL9X839ZflxPCRDHFilZLF/qaW7Lxx5QHoe</div><div class='del'>-Rx6cz+TZ4OEIj8hk2pEBtz3Qpb7MMfLuprJMyCQrJF3PYOTdRR3vp7Oa4bGUkupWCE9EQbjmnc3S</div><div class='del'>-NkgkVF4Ey3L1iUx2/Oy/V4K8um5+BIIj60i2TK5XUSLiI+mPm3g7pNIpWR0podkhTqakH4UyZNgu</div><div class='del'>-I8+a9O7/XPxMOwThsHu70vovbrplu1+pwO/zk8gnyeVyvOOiCznvoou44/bbefTRx1izfgPXfvQG</div><div class='del'>-0pkChXSKCZMmkstBR1cHmAYWPqxsDl0v0FBVRTJToJhLEonWceVVH+D9V1zBipUrrDPOPCdfURsJ</div><div class='del'>-G1l8lVVwyfkLyaTTPHrHbbz0wlLW3PoTxleGiLXWULdmL9d9/kssuvSTbF7+QXpfzrD6pa3kMDhh</div><div class='del'>-YSsnzq6tzw5acx54qQtXwo/hSpZyu8yPxGpdlqTwBUkIx7q3uryroe4aJOTdz3QO3L/dHuF6stsu</div><div class='del'>-z/41tTJ5OtyrmLnbYrSFVSzXM9gHIVuWK0xijWGwsKVzDMkN6nO1s9weo5UOGlK7uvvJGsVLIhst</div><div class='del'>-H+XrheXktZG8I25joLruo48yKzfYf292cxTyZbmMYJr9y5lMycCO9swHazOk51YOoV8Plajb0vuX</div><div class='del'>-u3+xDDmzR5AjSyLl6gj95NatcraiKMmi/Kz6QeTw1ZKBvDTgaS5ybrrkZ7T2l99Bvt5I9mWkScZ3</div><div class='del'>-KG1etIDhhD4Zm0T+yGiltZaL0GU4sL7erV/WCPkfst3CFWZWJPmJaZ0yAAAQjElEQVRhFP2xysg7</div><div class='del'>-Lt22D6IfsgxZYzjfdp+vjVEo/tmAg4lMx4JjJ+vx5IC/d3cfFfUxzn77BVx8/oVMaqlh7bptJNMJ</div><div class='del'>-0ok0s2bPZM/OHbT3thPW/GQSGfyRABYmRrqI6lPo7BskqCpUVtbh92ucftJ8/MEIW7ft1vWCkZtU</div><div class='del'>-VxXcNrAbVQ9x3Yc+xdGzKjjhhAkkH/suQc1HXs/TEFF4x8njKPT/ifWPp9n04iaeerqf9r0pFi2p</div><div class='del'>-Z7BziPrx1crRU5XWngy8uKFLjrXLA+dINc0mhxeyJ8JdomIfwgDqXKfcNZQyn9ljfCbDpUhH0kvi</div><div class='del'>-vu9omc8j7fA32nnmSB6uMT6TKQ067oQ6+xDa1XTJmD3Gvi0y8j4CY7m/fK1yfTrSwF5OPg+lzYsc</div><div class='del'>-uLjN4WqzQ5XtVyuTr/X+Y5Htcm0zmiwWy3gU7CPQBu5Q0Wu1B/J7HMr1ZOLdQ2k9hXmUSlIrJPf+</div><div class='del'>-bimXJsPIOURuOS23CNjBSs3HqiPKGGV0JFs+kjzYh3i+WwYPOH8su3WpkntGe8+7Lox95obPHBcO</div><div class='del'>-azWPP/0iqq2yeeMW+gcGueeBR2nftwe/ohKrquTm3/0Kw9R5bukLHD19Cr5ghP6BARRMFs6bgeYP</div><div class='del'>-MNSfxBfyEwyFiFTE0CIROnv6uPbqa5KGruemT2+IWpmcVqlAZbBIfdBPtZqhSgVrTz+Gz0dVax2K</div><div class='del'>-qdG5qo+dS19g1/Y49dWVXDQpwPyjGqit87N1bwqNWizbF22Pp9RcXs+4WJzlYuTlapaPBA6HAtsH</div><div class='del'>-mR2/mkVtrDLHkV5nYbR7W7wx23faI8wQXusCUK+lPexX2a+vpj/tw/Tc5hFoM/t1ksnDcf/R5PpQ</div><div class='del'>-+uL11gn34nLWa/QIjiQbI11PTu5zEl8zlDLst1BKFtzLcM6JnOSXPEjIyD6InXk1a7q8Vhk5lHsf</div><div class='del'>-tvPHUjWwXxmCbgbNz332a8c0VVkzfn/HfSiqxmB/gvWr17Bv1y7yus7gQD+FfJ5N6zexactWpk2a</div><div class='del'>-xIMPPsTV11zL1j3bMHMmTz61lNPOOIs///F2IlWVKNhYus2mzbv5+z8e1Tv3tcWB3NvOOrair6c/</div><div class='del'>-4DMVmqpqqQwrmP09TDt+EvrOAaoaYoRDAdL5BGHdplJVmXF0hAXTTeyCSc0MG82qZtm6PsxAmC3d</div><div class='del'>-Q+pR02dGw9VVRldXrzGCobc5sAzmrbwngQcPHjy8leHeTMvJy3ByJJyKmH6Gq4OyHP7l0P8loR1q</div><div class='del'>-B6x48cWh1atWLY9o+VMnTp9Q0bmti5b6eizFx1nnnMvRs2dz5113s237Dl5ZuRLLhi/c+FlyVp4V</div><div class='del'>-y15k98atRGoq2L59J7t278EG0vE09TU1GLZOhaLbu9vbnMzwTCgQMi3VxPZFSBYtgsUCe/p9aM/s</div><div class='del'>-4oGNORZlLGoTFslckoaojxOXTCazfi8JVKqnQ9sqFV80z9QZLazZmKK7L8WlV10fOFNTpm/Z9CUr</div><div class='del'>-myu460zl38vlC3hC5cGDBw+vHwGQKw+cBNgw+yejygnNToVLkdd3xdi3LMYSGpA9Airge3HFc0OR</div><div class='del'>-Kt+Fho+qnq5uUmmDytpKvvaVr3Dm284ibxRZtvwFmsa3Usxn6Oho5+GHHuDWP9zJnvYuUvEh/nrv</div><div class='del'>-Pdxx931MnNTExRecxfbdu/FHfVAs5HbvboublpUC0osWTavv6yuGE9kiuzuSbNk7QE+2SKS2BcvM</div><div class='del'>-0Z30MWnhBSw4+Qq27exBCRcJxFMoWKT2KITqKljfb/PEqn5SSoiFJ5zEJz71OQb6uv3r1q2L9vYO</div><div class='del'>-ZCRhkRM03GECzyvgwYMHD28cIZArNpzywIwgCEmG9xGRFxPybPZhIgIOGcAhAz3d/fqxixcl/usr</div><div class='del'>-3zi7JhRUVm3aQrw7zspVa3jkiad5+OF/YOl55i1ahF7Q2bGrjYHuAQp2kdrGGvLpHEVbR/MHaJ40</div><div class='del'>-jllzZ7Fl525aWhuNbes2Dwwm0knRsclZs2a09GQKEX8gyu9v+QMfu+EGJs+cwee++j22tXdx3FlX</div><div class='del'>-8JkvfJU58xezp7+X1cvWsXhSiFRbmqCiMGQGeOCVHhZdcQU3//YvzJo3j4pojMWLjmPz9i3BXbu2</div><div class='del'>-h7OZfIYD42CG63ePDHjw4MHDG08GDPZfAMg5nCqqw7nk9P8JjHXvdMvVAbm//+OFp2uqJz235JQz</div><div class='del'>-qGusxUJh4+bNLF+2jEx8iONPP5bf/OInfPHznyEaCtLUOp7bbrmVe+/6E/XNEwn7Y/gUP+tWbOc3</div><div class='del'>-N/2ZqU1NpLtTibau/jjDq+QNtYybpGdSGcK+ANlcjq079/Dcc8/y0GNP8Ktb7kXXhxf62rGzk0fX</div><div class='del'>-7OObTyT54x6DPXWNrPfVUtSqeNel78OnBRhX38TFF13Ecy88RzgYo662uq65tW62ojCO0kIUzk95</div><div class='del'>-t0L37k6KJzoePHjw8IYSgYLr8EjAEfYIHOAV6Orq+v/tnXtsU+cZxp9zsY/t2LETyI1rGi7hEli4</div><div class='del'>-3zsuAqH1grZK7daOMaAqaOPSThvStmpbWammru2mQaFF29oBE1QCSjtooTSUGCgtNEBJAiEJiUMS</div><div class='del'>-27HjS+zj67F99kdymhPj0LJOLYj3J33K8cnxybEU5Xvyfu/3PEmdTteycOGSMn2WIb+65jIiYgJG</div><div class='del'>-gw5dogi3O4i6a/U4/t67cLm9ePyxR7By5WoUDByMv7+5CwzLQyMI0BsETCgdgoKiwsjBtw/bZVlW</div><div class='del'>-bCa9AHxTxw4vag+IeaLfh5qGBhz+zwFUVJzC6dPHoGElBMIhjB4xCOc+O4sdO17HhMnfwebnX8T0</div><div class='del'>-mbOw6/0atHQEcN3hRO2Vy3jsh49AJ5iwY/sO7N69G1drr0LLC0wgENSBQVKSEhH03TKmjpbsL1mK</div><div class='del'>-IAiC+PbEAf09/gaFgCIGvvBDr6ioCESCvprVK9dMqW+8khuTojBodZAZFojHcK2xEU6nCwmGwfWm</div><div class='del'>-dhz+4AO8feQIaqtroON5mHRajC8dhJKhQ+JHjla2ezzeTqUSgJ4wF8GSK3GpxIS83Hy89NLLKCos</div><div class='del'>-QNn4SXht+07U1V/FZ5cv4djRkzh+4kOEwmEUFA/FL9ZvQkfYiz1vHUJjayd++/vnMG/BQjz/h9+h</div><div class='del'>-4YYN1sozSDIsIKcw+f5y3D9nOtvRYjf7u4JhudchTZ0klW7YQb94BEEQxD0pBG7i3PkLgdOnK6oe</div><div class='del'>-evC7Yxcsmjdgzdr1nOjzo6G5FRazCZyGRyImIRIN4UbrDXTYHWAYGTISKCrKQknJgMhx64Wmq7X1</div><div class='del'>-DvR6ZnvQvQWkc/jQbGgY/Vy70wshy4BzZ6xgNUYsXTIP7xx9H87WToRDQYjBCAAOtvpmHHrnEPbt</div><div class='del'>-OQh3hxMbnl6PDes2wGQ2Y83ap1FXew2JZAo8xyEFGUvnL8YLW15GU6uNvd7cYEzGEmIilUqPk4zj</div><div class='del'>-Zie524nPJQiCIIi7Xggozkvp1q9oa3OGvG7/5XmzF4WHFRePFYMOTbaRR1FBLlpdPhg0enAA4vEU</div><div class='del'>-si0ChhQOxIyZEzGkiI8fO1pVU1vd2KaqBHh6xEB3RYBnvWOGFX/f1eWH1foxWmxONNpaYD1Zidoa</div><div class='del'>-G+JSDCNGl2LL5s2IxmKwd7iQiEbRJYYgSUmEwyF0BQJ4Y9cutNrsyDYZsGHdo5g4aQ4qz5yF0+VG</div><div class='del'>-ltGIqk/Po8Xepsk1GbhQKCymUrLiFa2sRcXR10uaKgMEQRDEXQ/zP1yvjmDUoruJTgfAKOgEy+y5</div><div class='del'>-s0dOnDhyyc/Wrps7etT4nE6vTydoBeG9w3txvdWOKdOmg5Eckarzte5/vrm3trHB6cLNMZRKj0AA</div><div class='del'>-QOSpVfOPNTVJRkP2AHT6PHC5umA2ZcHlDoLRJPHAkgXY+uqr+Msrf8W2nTshxeJYt24NZs2cieUr</div><div class='del'>-ngTLsMjPNcNgysbFS5dxYP8eLJ6/BBt++Svs378fLCMjEgqAE7SwGLWpiBhuaGvz1KA7i9uB7ix3</div><div class='del'>-J3odq9TRrbRFhSAIgrgnKgKZBEQfj+hkIinZmmy+T89eqN629bUTtpaWWrMp22k2ZwezLfnto0aM</div><div class='del'>-axeDYce2bXtO7djxr0+8XtGBbgcoT8/o7BEAXpUQEIsHmZJ5w/JmP/H4A1j10xXYuPEpmPMKUGk9</div><div class='del'>-A44HXHYH9h04iI8+OglJSmCgxYJhQweD5VhcvFgNKRbDvrf2YO2qn+DkyROwnr2E8kllsFZY0WRr</div><div class='del'>-gsViRiKVBAMWWk5mhg8qMsejklcMRwIqkZK+ReXrWM0SBEEQxF1ZEVC/T51BoOmpDmjR7fikR/eW</div><div class='del'>-OwOALNU5oedaJZNb2Qqi7AcV0esKpRhDxMvLC0ZZ8kzbps6aNHbZ936OkvtKEQx24bk/bkGnuxOd</div><div class='del'>-dheanHbwHAdB0HbPy3IKPMcjGo4iCRbLli3BxPETsOffe+H2dMFsyYbH5UUyJUFv1EOKxcHJKcTj</div><div class='del'>-EVgMHPJMOQ5rVW0FgHYAbQDsAFw9owt94zKpV4AgCIK4pyoCyFQRQF8DHrUftJIzHeqZ4BUnKH+G</div><div class='del'>-0YW+DlExny/i0glyu73TM7Kh5fPCG61NiPrcqLM5oGV4TB07CM9sfBLDBw9BW5sdiXgU5dOnYsq0</div><div class='del'>-6RhXNg55hRZ8ePwYrNZzCPi7wCSTiEsxyHIKMgPIiRQ4gYVOlrBo/nRsffE3GFxSrK+6dDHs94dv</div><div class='del'>-KJUJ9LpZKbnSJAIIgiCIuxr+a7w3PT5THdqjdn3S9lQBlKFkcqfnWivZ70qTnjLZpmKxFGqrvYfL</div><div class='del'>-pgiXCkz6Z+ubG8pu1DeM5WMJXo7IGDd5Bh58eAXmzHfA7nfA1erErzdtwtTyaV887JpnVuPKlXpk</div><div class='del'>-sTyu1jVBjoWhN1kwY9o0BEUfrtka8MKmZ/GDR1cAAOpb/saPLCkcFg5EtC6PGEf/mdsMaGmAIAiC</div><div class='del'>-uEcrAsDN2dFq9ye1MFAmd2WtPdLPULtEqSdf2eUQxfqr9kqTJqvKoGcv5+rMosyxuSGf1+hsuYaa</div><div class='del'>-i6fQ3NGKYNAHzsDC7XKg/kodImE3Ovz1mFc+Ew8tnQNnswusTosf/fgJvPKnP2P0qJH45MwpDBie</div><div class='del'>-g1iXC/94fTvqqs+heNgAQyIWr2lu9VzvqQqEVBUBdaMgCQGCIAjiroT5P98rPbaYVVUAWFUlgM0g</div><div class='del'>-HNRLC6m0/77V91N2KuiNBr1ZI2gt+XnGonxzdsl9owaPGTpyyLSwK5Yl68F5EyG20+MRomKUc7vD</div><div class='del'>-zJjSEjy8eDH27T5o8oaCbGnp+Mjy5SukiuPv4mjlx8jR8SmO4aMTp5TJ5hxT4MAb+45eaXR8HpeS</div><div class='del'>-bnRvbVSWM5RdA3FQIiFBEARBQuCWgqC/oUa9vKAWB+n35HqGeuuigO5GRF3PEAAYdFmCMZFICgWF</div><div class='del'>-5sIskz6L4WU2EpQ4PsWymqQ8Jid/oODz+tu9ouiPJSQmx2SR9XpWsjU7HNFYUmlcVGddB9Hb4xBB</div><div class='del'>-7xIGGQsRBEEQJARucW8m7Tj9++rSevpx+v3UVQYevX0Hyo4Fjeorr7pG8T1gM1QnmDRBos4aUPoc</div><div class='del'>-lGULZadAerMgLQ0QBEEQJARu8+dkEgJftdqgFgScatJPP/4yAZAuBOQMYqC/JkYSAQRBEAQJgW/p</div><div class='del'>-mdWCgEHfXgQuw8TPpl3f3xJFpp4F9a4G5TgF6g0gCIIgSAjcMYIgkzDIdD59maI/IYC0yT6Z9poq</div><div class='del'>-AQRBEAQJgTvwMzBfMuEzX+Ezy7cQBennCYIgCIKEwB38eZjbPJ+pUVHO8JogCIIgSAjcAc9OSwME</div><div class='del'>-QRAE8TX4Lybv2o9oSY6CAAAAAElFTkSuQmCC</div><div class='del'>-</div><div class='del'>-------- =_aaaaaaaaaa0</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;26389.957885364.4@twelve-monkeys.helixcode.com&gt;</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAFcAAABVCAYAAAA8AHhnAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9AFAhIKIGIgTigAACAASURB</div><div class='del'>-VHja5b13lGTned75u/neylXdXZ27p2emJw9mgJlBIEAkggkkQXIZlHkoWV6ttVrJKx3t2pZ2Ja7P</div><div class='del'>-UtJ65bUtyaa8FkVZgZJMUzTFAFAgQBJxBmEiJvZ093QOlcPNYf/oauxFoQeBHJAKdc53qupUd917</div><div class='del'>-n/u+zxu/twT+4T2Ezoo/wrfqQP8QgRW3APaGAyz+AwNWBKSPv/fmD44WE0lA6qy3RNDEH6D0CN9H</div><div class='del'>-zXlZYm/emfxfbav9hf2Tg+/uALsJ+t9pcF+WHEDuLOmturCtrnWkQLbVdH5ZkuTTi2vm051j/73Q</div><div class='del'>-XhFQAB1IdVay815+iy9SBJSizr+9ZTL/BJAHckAaMN6q48s/AKlVAa3zPgLc2HorDIsACH1Jbb+m</div><div class='del'>-RT+T682/nyvVzc+iznrL7uj3W3rVw5NDRztSk45JjxqjiRvOtZHofWZ8Z+9fPPbM9PNdwL5l4Eo/</div><div class='del'>-CMkVHfOz+ZR6qG4Hz3W0R+hcZNhZ0Q28mcIt+3v/aTKp3LNWDT9Wb1hx1yu+uNFAS99Hqd0EWN45</div><div class='del'>-2js+Mtz/j3sKyebSWuNKjCJCILhBFykAwp1Htk2KQvQnyXTmo2fOLy1vcSP/3oArAEI2k5kRIu+H</div><div class='del'>-7rv/3rvDMHhhYWm9FJOmG6WuIiCMDKS+HIbhf376hfn/FvNK4jcyfKvo4fsJ7uYFCOV6yzQ05Ykw</div><div class='del'>-9D501523v+vkmZe+5riB3bn4sEuyvusbedfR8X/mum7vc2dXfzHm8kVbUNBbwrvfT3BfAXKlaZer</div><div class='del'>-1fITVrv1Yx9+6H3Hnj5x8uHolcBG34MUiw/eu+eWRrP1a00z/HC5avpdvnR0g7Xkbw24L1+c6YQl</div><div class='del'>-WQgvCEg//c773p448eLZZ7ti/rhxe6MAiPsm87oiRX/VaJj//YXpynxXoBLy6pvI3ydwXwa40rBm</div><div class='del'>-hcg5p+vy/3HHrUevnDx7YbpLfaM3YXAEQEjn+TeiIH/x9MXKN7dw76IucLuTWMKNCtF/kOC+TBGl</div><div class='del'>-Wnsmk1ZqiiL/GkTfLFXq1S6efiMSLABCcYf8kB+EO69cbv32dcLrrdy96DWAja/o7xK4L3sIi8vV</div><div class='del'>-k7LombcdO/LP5xaWv2TZjreFBMddOjEGngiImVHGBMJfsWv8rGtHdH2+FZC8DqjX+7u/M+C+LJ1r</div><div class='del'>-5ebJSml970c++L6Hnnvx7Ne2kJiXfeWtVqqPz4aW8PP1UmR2JYbELdT+FRFc7GbFpV3sWtdzL/9W</div><div class='del'>-gHs9HntZQust69HK2tJ7//FPfXLHU88+/1wXMJsZNa2T8NE7obNeGBd+KXT5Um2Zuc7nShf4cZCl</div><div class='del'>-LjDjWTqp879K1/+Jb0CyX3VR3wtI35W6vI7jL2VSemqkv+fPP/DQhz77W//P7z3ZxbubF/8ygNke</div><div class='del'>-blEMaby0EHxxMzAYG0ru7uspTIgCo57nRK7nlBCks+evVJ6/jo+7lWTHDZ/fFXjEX7OVTRC+C4mL</div><div class='del'>-q1L3a15Dfa5HCWxxkVImnUzumRj7kwfe8+Cvffr/+u15QJgY7r+nv9jz6YH+gYHZ2ZnLl2cXfj0I</div><div class='del'>-AyWblz++tup+rtBrHMjlEnf157O3G5KSzOeLeJ6H69p4votpNgjCYNnzo98/eX7lT7sMm7AFN0dd</div><div class='del'>-QPqA13ntXSfKi94oLcTVKK4u6haqmYg9x1dyi9dGbG1+hxZ7Vh3XE+qN5pOOZf2aphvPVKpVxkcG</div><div class='del'>-/8D3g+G777kH3/d7dFUOfM+6X1IMc2yi/2d27dr5YFJPbh/o6VdDV0AQdcJgQ/tFUUYUFDLpfDqT</div><div class='del'>-Tt/bk1XvaFut47YTBZ1jajGNUDvnEqeHbj4WtqC1NyRRAq+uHGweRO06aPfBX+sEXuUlbJFAiTrS</div><div class='del'>-ABBJMLlrYviTdTv4DUMW/ri/f3RClgxSqSzDw7n2E099J7n/0AH80MfQVcrldYQgQBZErKZNEILv</div><div class='del'>-efh+QCQI9PX2MTQ8jOfZXLry3MzzZxZ/yg8iNyZsQlcOwo9JrBN7jueh/c45B3Gpl18D2LikajEp</div><div class='del'>-M7IZY3tCU7fJUpTpyecGdC2RSiRSoq4lBUmSxX37DgpRFAmjoyPMzc0Js7OzeJ7L6Ogonh9U10sl</div><div class='del'>-q91uoypSJEmSOzUzs6rreuh5XrheKrUXV9dKm+oWQLtUqT5W7Ov5V6qW+urFi5d/7uMf/Un27TtE</div><div class='del'>-uTGTvMV2WVpeYOfOCRYWZnEsCyOh4vs+ohAiiuCHPpbpEAkS5XKLVNJldHQMb9yaqNfMT12YqfzG</div><div class='del'>-Fp5BELv5m4CqgMUri5rhFgGPsBW4m8DKMVATyaTWf2DPjk9oonxXykgdzKQzSsJIIqsGAwODyLJG</div><div class='del'>-b08R07QprVfpzfYRRiHNapPIj0jqSUQjjWf7mG2TlJZACSUK2RyyJHHz7ptIJlNYlokgiEiSjGm2</div><div class='del'>-Lcv3n3rkW48eP3PxpWt+KJ4ZKEof+PjHP4rjtllenWXm6lnm52a5447buXDhHGarDkKIFGjYtotv</div><div class='del'>-u0iCSOgEBLaDJCn4tKmurLBzfJSx0THqjbW7G6Z1fHHVOhnT1HhaclMyNzVW6gAMYG7BueH1VFWM</div><div class='del'>-SawOpI4cO/yz/T29//P+XXvUYrYXvACr2abdtFiut1BUHc/zERAIggjbdogiyOay1BtLGIa+UU+S</div><div class='del'>-ZVKpFM1mk3Q6TWl9jchyMdttJicnCaOIVCpFFEW4jkMYRezYu5+HPvQQ80vXnJ/7p/9TfdeeyeKl</div><div class='del'>-qasEIfze7/57PvzgO3nvu97Nr3/q1/nZf/IzSJKI5zmomky72SKwA1zbwzYtPC9AEkQSegJdTzAy</div><div class='del'>-OszA5ACW2+TE808vPXdm6V9u4c8GMePldMBsd5YJtDrPTowyXvYmpC6pjfuRyWN33Pmr99/7zl/Y</div><div class='del'>-t/uAtDC9yNzVWVbmlikvr9OoNTADC9tu44cOrtvGD0yiyEVVIyyngaooCIKAqqqk02nCMMQPAkzT</div><div class='del'>-JJVKIIsufcUsghTQaFaQ5YhafR3Pt1hYnmdprcqpM+fYtWeffM999yeXV9c5dMstnDl7iumZKVKq</div><div class='del'>-Sn+xn/n5BZrNNn4QYRhpFFnHtnxCL8RxXDzPJ/R8Qj9AEQXEKKLVbCAYEggiuqama7VKrWl69Zhh</div><div class='del'>-VWOlJykWvARbeBBxV+1lD0Tqklpx01LefPOh+z724R/59J6dezn+5DPMz84hI3ZEWyAioOnX8EML</div><div class='del'>-P2gThiae38KPWoiKC9iE4QYl+YFDq9XAcS1EMUI3VGRZwA9MvMBBVkRsz6bRbqAYKn39vYxv34Yd</div><div class='del'>-RFydmeXFU6ept0yCSGRgcIjZa7OIsoIiaRT7B1leXWdhaZ2x8UnyPQOsrdUJULBdC8fzkGQJRZaB</div><div class='del'>-aOP8xQhZElhYX0U3EoyNb8NsN7Pzy+XLMWCVLaK8sPPsd62t3DJB3qoMA2jjY2O/sGNwnAtnznPt</div><div class='del'>-8lVSCR1VlRGiAM9z8UKXKIoIgxCCgDDa+F5RijBNB1GUMHQVP9gwxJIkEYRgNmokEgmCMCST66PV</div><div class='del'>-auM7Er0DO9ANnXK5zErVoXx1iUJPlm07h1lcrDA3t4wgytQaJoqaxrID9u+5iVqtQd/gds5PLTO0</div><div class='del'>-bS+rqyWM7Ahes0ZoN0nrBrIYYdZqyLqC4LogQCSG+H6AJCmMju6gUW+Pv3hueshyvFrMUG1SgtJF</div><div class='del'>-E3qHd5WYZHdHbpHUBawCaHfddefeH//Rn/gX5mqdxx/5G3RVRtcU/NDBx8OLXNzQxw80BBREQUWU</div><div class='del'>-VAI/QpZUfC9EECSCwMVxTaIoQFElwshDkgRUVSKTzeJFvezacytDI7vIFkYp9IwxPLqbsYn9DAyO</div><div class='del'>-02jNM3ttlkQyh+9L+KFIOpMn39MLosTySolDt9zG7PwymVyRw7fcgZbIUambDI1O0NOfwnJt2mab</div><div class='del'>-SAjxPRfbMnEcEz/wQVPxg4jdu/YxOraNmZlpc7VcqXRJLF0GLtjCJfM6y9+KFsQYuPonP/mTn/zQ</div><div class='del'>-hz7ytvmLV7hw7iyI4IUefhjghQFeGOKFIWHQMZCCgCAIRBGI0sZ5SaKMKHqoiowkyng+OE6IJKeQ</div><div class='del'>-pCSKmmVoaIJSqczs3CKimmRhpULFDEnmRxnduZe2WeWmg7fSrIWUSxbpVB/DY9u4trSIqKpUWz67</div><div class='del'>-9hxkdWWNZMJgbW2VEyeOoyeSuJ6LbddJpwwUUcB1WkhiROQHRKGAJKoYqoJlmh1qGEdWkJ8/dXY6</div><div class='del'>-VpGOS+Km1G56D3YHXLsL3E0X7hWSuxkgGJM7d/yK2XIGHn/4YdbWV9ANnZAIUZYJI4EgEogQEAQP</div><div class='del'>-UQpBjBCECFHaOA9FUdAMHc9uoSgKkqDh+RKCmGR4ZA/JVD+ilCTy6zQaZZZWl1mt1DByPbR8ETmV</div><div class='del'>-x5cNVM2g1RYpZMfYM3kztXqTQl8vs4uzSAkNxzNYWS1z9ObD7N01ydrSAhcvXUSUJEzbxmu3kSJw</div><div class='del'>-7CaRbxP6DkIoEIUSBCJy6COLIl4Qsn33DoyUlnj08ScvdIX0USyw8WISa3WAtWLBxCvcMrk7Gtu9</div><div class='del'>-a3vxnrvuPNyXH+SJICCbTiMS4fkeiBBGIWEQEoYBoti5L9HGs+97G2ogSoiI5HK9BGFEGCkkVINE</div><div class='del'>-skAun6daM4lCWKmW8Yko9BRJF4aomzb9w8OUKlValsu1+ctkEmn0QKa6eoXJ7aOMjo/zX/768+zK</div><div class='del'>-7SFCZP7aKs1dLr65zvDIDm4+HKEm0rx4+iyRbdLSgMjHbnt4poMUBkRCRBD5BMHG6Z8/fx4xoXL4</div><div class='del'>-yMFNbyleHN30BMQtos2teiCI04IYN2THbjnw0PjQyLtPPPk05eUVhDDED3xURSYIA8IwIAx8otBH</div><div class='del'>-lCQEYeO+CIKArhskkykMI4koSQRBiKwYJFM50pkevEDAdgKaLZMgDIkIcL2QIFJwApGm5bG4UiGR</div><div class='del'>-ypMtFEkWR7k6s4SeSHPfvfeyd+8ujj//DK5vMzs3RyozhusEhJ7HttExPvbRD/HEky+gJdIMj24n</div><div class='del'>-l81hGEnS6QypdIowCAhDD8cxcT2byPVAFIgkmXxfD7Im8/zJcxe2yCNvqrsVo4JNn9ftvPe7aOHl</div><div class='del'>-u/Fysri3p++Ogd5ecB3sdhNJDFHEjbuvSgKaLKLKApIoIEnyhkETZSRRxfcjPC8kCCJEFHKFAUQp</div><div class='del'>-geOJLK1WcLwQ03bxw5AgjChXmwSRhKqnQFCY2LGHm246yk2HjtJsu7xw7iq7Dx5Dz+R58dxZnLBB</div><div class='del'>-qVLB9UPCUMZ2I1KpPNlcH6Zt8e9+9w/J5ArISopGyyaTLYKcRNYLaHofg6O7KfSPIicShLKAIIl4</div><div class='del'>-no8kSWQyWYIgYIvEObGmle7gItziOdqqV0wExPe///0333HsGG6jhqEpaLKEqojoiowqi4iECFGA</div><div class='del'>-LIKuJpBlDbFjXGVJw9BTKIqB4wTMza1TaziUKy0Gh8YYG9tBIpkmmc6CrLB330G279hNNtfDxI7d</div><div class='del'>-SJJBrWUxt7jC5alZDu7dT+j7tJs1FhZmmFtYJxIE8j0DVKttjGQSRde4OjtDo2Xz9PFn+aM/+hxI</div><div class='del'>-IkEUUmpUGRwbx/FFikM78QIdpAyZwiCKnkIUJXRdR1VVYCMyVFVZv04KNYpRQNCVrAnihmwTULm7</div><div class='del'>-lysIgp0XT59hZe4aLdOGTJYgCtETBoqk4roBhAGqomLbLhEgCiKyKOK6HpZVRdM00pksucIoqWyG</div><div class='del'>-nr5+5hcWuTa/wMDQCOlsDj8IWF1eQRB9JC1F23SotEzQ0ly+MsP+AzeRSxqceuEUoVnh9AtPc/LZ</div><div class='del'>-b3L09lspFAfJFYcZGRth9uoljKQGckgyqXHsztt46eJZRsbHMc0W56+cZ7h/iKXVKgNDk6yvyjQa</div><div class='del'>-DTK5QcRodYO+FA1BENENg4SuJlzXd7fIF4Rdvm8Y42N/qzL9K0oXud58enb2Gj25HDu3bSOh6yQM</div><div class='del'>-HVEAURAgClFkCUWWIApRVQVRlDaOEAToRoLR0VG2b99OX1+RVDpLEIicOXseP4goDgyhJ5KsrK5y</div><div class='del'>-4dJlBKQN7yMUmJqeJZFM027b3PG2u1BkhTPHn0B2G1SWZxnpz7Fz+zYM3WDH5BiCYuBHLj29eWy/</div><div class='del'>-zej4MHfffzerpWUGh3s5efp5EmmNZNpgenaGXL6P9UqLRKqX4ZFJwCAKIQxDyuUyvu8zNjbGyHB/</div><div class='del'>-pstYRVtIqx9zyfyuisTWLaT5ntzQ+lqJ3t4BevNF8qkUCVVGikJ820ZGQEZCQUYMJdqWhSCJpDMZ</div><div class='del'>-Cj295PMFZFkhDMAybZbW1/GBsW3b6OkromoaKytLRFGIAoS2hy4bOJaPYWTxvYA7jtzMYEbn2unj</div><div class='del'>-rM1doVWr4viQKoxgBgb1RkBvYZDJ7btot5r0Dw5SHBrl8adOYIUiiUyB5bUyt9xyhCunXkL2A1Kq</div><div class='del'>-wOL8ZQYHe/AC0FMDaKkhhGQKJaViGNCfyzFSGGGodygbC3OFLYIINwauF5Pi7j6IV4I7c2nmcqVc</div><div class='del'>-xnMjMtkijt1GCHz68jkG+nrRZAVJEBEjEUmQ0FNJAgFsd8NIGYkUmWyBldUSzZZJtlBAVFVsz6Nt</div><div class='del'>-mSwtLeLYNo5lUuzrRRYE5mfnaTZMBCR2ToyjhBZf/NzvUJo5RUqTcByP3QeOUncU1mo+1VbEyrKJ</div><div class='del'>-02gyuW2CSrnM2nqV4fFJ1GQCPV2gWmuxurJGwciwNDVFSoWkETI9fZZsLoEXCKiJApGewMMnmVLR</div><div class='del'>-EHBqHpFFbotkf9AVJLgxnvWv15n5qnq+KAluKAgoCaPzaYSiyARBQBB4CAKIokAUBeB7aKpCJp0i</div><div class='del'>-k0lTqVS5Oj1N/8AgvcUBgiAimUwhywr1eoNsNkcmk8V1fZaWl1iulJnYtZ1MPsHuXaOsLF7h63/9</div><div class='del'>-59jtNeTIpFKtMTw6xvmLl1FVne07dnL01iNcm76KRMjpF0/QV8igyiJ7d42ytrJGJpmkkM9tREWK</div><div class='del'>-gCCFrK0t4HsmouAxN3uJTEom8s0NF1KU0DSN+flriKLAof0HCoosq10+bhCrSsTpwLkeJcRdjJej</div><div class='del'>-kInt26eSPQWWqzXCaCOjFRFg2W0azQaua20AS4AQBUS+S7NZZ2VpmSiKyGTzVOpNHC9EUTRKpQqV</div><div class='del'>-SvVlUE3TJp8vkMrkGNm+jYZZo6+YZmXxEpfPHSd0SoRuFT9oMbl7D+vlKv0Dg7RMC9NscfbkSW49</div><div class='del'>-ehO3HTtCWhdZvjbF4b27OPH0Cf67Dz5Au9Wg2WwQhgFIAcmUynppmbn5K7Qaa0hYLF67QH8xRcJI</div><div class='del'>-ISCjaRql8joXL51n9+494r7JnYWuyCwuofFyz3UpodvNiIDw2uLCybptc9+DD9Jb7EOUwLZNqrUy</div><div class='del'>-YeghySKCGCGKApIYEbg2oe+iqgqeH7BertJbHEDVE7RaFkQiimzQbFikklkSRpowECCSsOw2hUIG</div><div class='del'>-s7HO8vwlGpV5KusL6LpMtpAl29NDKCoIkoJhGOSyWVRVxjZtJkaHSMqQlGBssMCB3ROsLS2T0BUG</div><div class='del'>-+4vIkkgmmyaby9DblycKHFQZQq+NJvk0Sqtk0z3IcgIQUFWZ8+fPkUwmeOd994zFcOnOkG0C676W</div><div class='del'>-MesGNwSCheXlZ64uziEmk2SyKSyrjSQJJBIa2VyadDqJrqsYuooQeCgSiFGIaZlYlsXQyCjVRoty</div><div class='del'>-vUUqnUeSVEAklysgCBKCIFEuV8nn8rhmk2tT57l6/hRuvUTkWQwODpAq9JLtG8YNJfoHh/HDiCAI</div><div class='del'>-MC0TVZaw2y3WluYoL85QXbnG8Sce5+KZUxw9fDP5bAZNlUklk4ShQBBAf98AKSPJ4twcTruFKoAS</div><div class='del'>-RZgtByKRMIyQJBHd0FleXkURpEFZEpWu0DaIGTG/q+pw3Y6bePZHajQa5dGJnZ84dPiomhPazExd</div><div class='del'>-Qjd0enp6yefzCKIIkoAkSfj+Rk3M8wNUPUEyncN0fBQ9RU9fP62mhW05KLIKCKytrROGEQMDg6yu</div><div class='del'>-LJOUQ5Znp8joCookoqo6WroHIz+MQ4KGBaqepGXaqKqK2awzOtjL+GAfa/OzjAxkUEU4dvQIiWSS</div><div class='del'>-VttmeWUV1/Op1erokopjOfTks1itJilDI7B8EooOASTTBYgsBByEMCCKZDQtjZpQhcXla3al3lyN</div><div class='del'>-Zb9anVUHmp21mbCJrgduFAfXbFtB7/D4vn17D+wpKg4nXzhBuVxBVjWqtRqlSpkgDBFEEc/1cFwP</div><div class='del'>-UVZIpXMIooakJcgVilRrLTzHJ5fLE4YR9XqDTDpNb0+Rq1evIokCVmUBQ4KUruGYNj3FIfTsIIFe</div><div class='del'>-QEwUECQD03aoNVokDR1NFhnsySNHLoFrsjhzjnazzlNPP83ly1e4+977sV0X03FQZA3P9NE0jVaz</div><div class='del'>-iqEpKIKI2zIRQoF8poe2E+A4NUTBQhbBtkI0Pc3eg3txvJZx7uLUhQ64m8A2gUZnmTFq4PVo4eUa</div><div class='del'>-/ckXnvn3337i6zR8ifHJw4QkwFdJGwXaTZ9G06fR9onCiJSRIJdOIYtA5JJQRarlRVIJgVRGBhxK</div><div class='del'>-a0sErkW9tMzK3Euk9TZ++xq2tU42n6TpmLiSgq+k8CSDlh2iqEkC18I1WwiBTyqRxG6b2FaLRn2d</div><div class='del'>-2269iRdePMHcwgzJlEFxoMju3ROISIQeNOptbMdCkiRCZFQjixNKhFqCtu+zWFmjZyBBOp8gCCPc</div><div class='del'>-IEIzZBpmhUJvL+9690PZbWODg1sUKoMuro1erxHvFX1SlfX1+vi2vr3vuO/9k7fefg8ri+sszi4R</div><div class='del'>-edBs2Wh6imQmjyxGGy6PrBCEAa7nIxBu5HaFEC/waTUbDA30Y7daeGadvoKG3VqmUZsDEZqOjYOM</div><div class='del'>-mMhRGNyOg8rg0DaWlpZJqjKtRpN8poDvBOgyFNIqIwMp/vpLf0YmreH7AYVikR/5kR9DNwpMz8wj</div><div class='del'>-KwaNehMhcrAdE4Bmq0kkiggiKIaGLwS0rBVuu/VmGvU6rXoTQRLp6SvSUxwile2hXFkTLl6+cqWT</div><div class='del'>-DYvTQqsj0e7rce5Wzb+i57mXewr9Pzo2Mi7VqzVeOneWZrNJPpchndYRIg9dU4kiCCKwLBcECT8C</div><div class='del'>-SZKRJIVatY6hG5RWVunrKVDIp2i1qqyuLpFOJ/EjiTCS2L5zH7YLbSdk28QeTNMjmUhit5qk0lks</div><div class='del'>-y0XXdJIJhXxSIanB7slt9PflmNy1m92799FsOyiqxuy1BTTdYHFxkaSh0W43MdtNrHYLVZHRNAlN</div><div class='del'>-VVA1Fdts4dkOtx09RiFboFJpUKtZZHJFLNun1ljLvnThwskoijZpYJNv2x3A/TcC7qt6GNbXKs0Q</div><div class='del'>-0bg6M3PbwYMHufmmQ1y5dBERj75CmkImgSirOI5LGEQb5R1BwXV9JEmGUEAIwXdddu3YgSrD1NWL</div><div class='del'>-mGYTSRJotduISgJVT1HoHcILRIZHd9A2fRTVYH11DVURaTRa9BcHqFYqGJpEQg0ZHczRm0vw7cce</div><div class='del'>-pa+3yP4DB3jm2efoHxhhdX2NdCZDrVZFQsD17I0ctL+h0bomE4UBRBFEYDbbVEplDu2/idtvvwtV</div><div class='del'>-TbJt+14OHDqCIPni2bOnrzWareWOtLaBWgfoTXCjNwJu1A300tLimbbVuvvIkaMDtxw5QuC6VNZX</div><div class='del'>-8Kw6uioSomDbDoIgIckKCBKOF4AgIgoiKT3BkcOHaTUqTE1doN2qEYQeju2Sy/ci6UkSyRyuL5Ap</div><div class='del'>-FEmm8hh6mlqtidXhV1VVMbQkltlGEUL68gkCt8HMlfMUsllUWcV2PARBZs++vSwuL5FMGSwtLiKw</div><div class='del'>-QQNRsIFBFPposkQYbtgg17GRBYFWo8n87CyqmuCBd76Hvv4R8j1FkimdE889W11cWroSM2ib9OC9</div><div class='del'>-lqfwel2Ogu/7YRC432nWax9VFd146IMPkcukuXLpJaqVUqfo6CHJKkEIYSRS6OmlUq1x8MBBDu3b</div><div class='del'>-T6te5eyZ5wkjB0naKAHJioZpe+SKQxjJHEEk4gUSkqzTatq4jocoimRSOvVqHT2RJPADdFkgnZQZ</div><div class='del'>-G8zTm09QWlklQsD1XA4cPEjbNAnY8GRKpTVaLQvHsVEUGU2VCXyXjYTeRjQbBi4EHroq4tkWpXKJ</div><div class='del'>-5dV1ltdLrJcr9PX18MyzT1kz12ZOdiR10wUzYz7vmwL3Ffu1TNO2SqW1p4IgfF8QCMadd72NWqXM</div><div class='del'>-mdOnUEQNTdURRIkgjDBtj77iAHfd9XZ27phk6vx5nj/+FI7bRpFDgshDkVUkWSed7SVfHGJ1vUIy</div><div class='del'>-lSOb78MyPdptC8/xkQSJRELBc31kRdswBr6LoYaUV6bJJjUuX7xM4IfYjotlWViODUJErV5FFCVc</div><div class='del'>-NyIMQ1RFpl6rQhSgKiKiAIoio6ohlllDlSFpqKQzKZaXV7g0NcXi8hKTu/Zy4eL5mUtXzl/sANqM</div><div class='del'>-tTJZrxdEiNfbwhSLSOxyrXHm2089+aOPP/X0fCDpfOQTP8U973wvzWYT27bxfY97776HT//mb/KB</div><div class='del'>-970fWZI49eKLzExd2QhDUwaObaKpCpqhIYoKqVSWcqVOMpWl0Fuk3baxTAtZlJEEEbPVoidfQJZF</div><div class='del'>-FEnEd2xkReKHP/YRCvk8mUyaXCaLgEC1XAYiBgeLtJo1MukEq6uLGx6M69I2TRKJxEa4FYUEwUZj</div><div class='del'>-i6IIqJpI26ojiAG208QLTMLIwbQatFsWpmnWu6oSwnVaZN8ULbyi69u0zFLbbD0yNrpt56Fjt0+M</div><div class='del'>-jGxn4qZD7Dl8lKGJ3Xz0Jz+JIOv81z/7POvLS8xNXUQMWqSTCpbZQJJk2raPbuQZHt9NIGik0lk0</div><div class='del'>-WaPdsJFFFdsOAAlDT+K6HmrGoFytkUlnUSQRMXQwGxXGR/qZnr5MhIWqSzieyTvecS/5Qpql+Xny</div><div class='del'>-6RSryyvYgU6j0cSslOhNJ5CjgBCBdhCxVquT11wE38Iya0gKuJ7LWrlKIplBkg3uvfedfPmrf/nc</div><div class='del'>-ytryakdiNxvvzFiO4bvi3FcBXK1X21/66n/7+vy15WttN5jce/ut+bn1GrfcejsD/UX+47/5DPNX</div><div class='del'>-LyMFbUTfxPUbRPi4jo+iJDGSBUIpiaRmMJI5FEQKmTy25XF1aobBgRFEFBRZJQgj7MjD9TwIA3RJ</div><div class='del'>-wGyU6C0k0dQQy2pQayxh2U0kWcB1bXZO7GB5YYFWrQGhSMURMNsmmgAZQ0MkwidEz6QxrRZKfR4V</div><div class='del'>-GyMhIUgRLcvCC0SSyV727zvM3v373d/87U893lXtjXc2vmYgIb7eDsdYRrZsCwAADsZJREFURLLZ</div><div class='del'>-CNH847/4wy/8/C//k/f94s//jz/2hb/80z9JpzQWp69x+rln2L1jhIQcktQEVCNDywZBzyDqaQJB</div><div class='del'>-ZXBgCE0WsVt12o0mYRBimW0md+6E0EdVRKIwwNBVDEVHE2XSRgLHbqMqYCQgwsZxGtz5trdTq7UZ</div><div class='del'>-HZmgXKoBIg8++H5arTae69CT1YlCl0DRKJkBDgqB3Uaz1uijgtheY7wvw9F9e+lJZ9BklZ7eIoqe</div><div class='del'>-YGhsnIuXz61fZ9dOd6sTbxbcOMivAhioPf6tR5/xrNbE8twsn//Pn6U3ZzA/9RJeq0xWBy8ICUQV</div><div class='del'>-HxVf1Mn3DnWaki16UgYiAp7jktQNErqOoalY7TqBbyJEHm6ziRoJRI5FYLWQcGnU11hdvUrbLHHT</div><div class='del'>-wZtJpfKYpoMkyczPzbNtYoL77ruXSmUV2W+gyj6e71EzLSIiBKeBOXeWYUqMF3QSuIRmi4XpWSRk</div><div class='del'>-2qZH03KRNI1HHv3qUtc2qXhztMjrjM16o+CGXYU5G2hnc9nBu+6+684D+/dz+tTzHD64m9LKHKMD</div><div class='del'>-eQwlRPRdCpk06VSG7Tt2IUoqYRAhBAGC55FJpqlVqiiiSOC5pFMGZruBGHmoUkDkNNEiF6dVoTeb</div><div class='del'>-wDVryILH6to8hd4MFy9eJJ/LMTU1ha6piBJcOH+GIHScYjGL114lMNfQBBPVr9NamSLpVeiJarx9</div><div class='del'>-/xg37dtBFHhMX5mmXGpgGHmaLYd0tsDEzh088+wT89eLYN/I3uA3M0/mVTQxtmPygUNHjyGqGplC</div><div class='del'>-ASOZQJQERCGgXl5j32AO3W2SM2Rc08RstZBEiVw6QzaVplVrICORNAwMVWZhfhZdFdF1EUKbpOKS</div><div class='del'>-0j10wSbymihiyP69k4Sez9rqKtMzU4RiUNk2MYIgBayXF3jq2cfXf/lXf/Hc0aP7qJdmaCyfR6xc</div><div class='del'>-pNebZ0KtcsdkL2lMArOBqCdxBY1K20fWCjTbIc2WS09vH1dnrlRXVldaXbZJejPewpudzhRvjKA4</div><div class='del'>-tu1Yy4uo2xZ2EDGxazeFvuJG/1c+w1AyolVqIUg+lVYdAhHfcdELeURBoFKusn3nTkRBxHYd6tUS</div><div class='del'>-o+NjCGKIIAVUy/Ok+orYQQsCjUppBV3RWV5eI5dLsO2uET71r37r0tuPHT4yOjqsprMC//GP/vzi</div><div class='del'>-5alrc1/+yp8f3DM5qib9CsO6QMKuoUcht47vpF89zNx6hTPTZeq2RK64A7mgY/oKd997C/fc/w7+</div><div class='del'>-4r/80bXrbAAUuwTzupuuv5vRV5v530jUjB25gWFqloPpBVyZmaN3YIh0TiXdk2Z3UkAT4exqlSgI</div><div class='del'>-2TZ+EMsJMPQk6ysr9BZ6yaZzhFGA53tk0imiKMS1bXRdQgib+LaIpsgookyxt4f+4gCFbB+TuydA</div><div class='del'>-8HE913v0yWefHO7PbPvqN4LqwmpjGnBOnnlhblt/dufhnUPsT4dkTbj60jQ56iwKAr6SYqZUIRBT</div><div class='del'>-jO/byey5aXKFAvfc+y76+4vh3zzy5Zmua5auA/INoYVXRXITE7u4+dBe6rUmkR/yjUceRlUV1tZX</div><div class='del'>-ccOA4kAfvTnokVfJWFdoXHgCa+ES1YVpZqdOkWSG5txllHqA3KiSDqeJGk9DbRa1KZKIFLzGCrI1</div><div class='del'>-g9ieQg/WqazN0bCbVJwWp849j+N6lusHzZnF6vGF1caZTZepWm9dadcWSSVV1GQ/1aCPNb/AtWaK</div><div class='del'>-P3vkBdpKDtnIIatpREWnVKmy58AeRsaKfPnLn581zbZ3HVqka0vUDaOFV6jI1MXLfPuxE+wZGcJu</div><div class='del'>-tRkdyBKFPtPTV5m51GJX+gHWV68xmmtz+4EJZubaXJhbxGspFBNraJZLY3WUsV0fwG5dRNWeI5Lq</div><div class='del'>-VBujZKUikdBk+zaV0Ckz0DfEuYtVxFaDIwcP07djhOX5c2HMizFjqUC7aXFmvb7y3iuKxsmzK5gV</div><div class='del'>-nz277+E7ixbnyj6jcpr+4hiakeHCSy+Ry6Qo5AzOX3gx/NznPnO5S9WjLaRVeL0BG9/LRDxhfXm+</div><div class='del'>-NDdzBXN1CVnTqLUs9u8ao/GczUhPnnLZRlWT3P/eO1Bos3e3w95rLU5PneKudx0k9FXWF/v5+lf+</div><div class='del'>-mOKwwtseGKLQP8nidJavfulbDI7Y/MRP/BDXzr3ASHEPw4UQVU4RrfvsumMXV86daHeiJDuWb20B</div><div class='del'>-dtsM/TnTWXbM5uDIyDjZPo2db7uVb33nSbRCEV80cD2L2bmNNqoH3nU/B27azTe++bXZer1ubVEy</div><div class='del'>-32oszGsOuPhuaUEAkCLnxLNPPMbg4ADvePd7KDXbXF1Y5oH3vZ9scZBqpONoOf7669/gyvw0ckHG</div><div class='del'>-al7jvtt76UsuMjzcYrRvgaMHLN59T4E92wR6jDoT/Q57xgMGB1NIakRPXy/T8wssr5XxbJ+luUW2</div><div class='del'>-DY2gKIl6xzXcLCDWgApQBWpr7fAE6Sy1KGR4726uldaYXVzmnre/k+q6yZWpJTxf5IMf/giFnhRf</div><div class='del'>-/OKftv/DZz5zrmunTve22a3Gw9wwyX35TlVX57504MH3/NKxYzcRuD43r93J/OXThH6TXDrDuXKL</div><div class='del'>-cmkeMahxbrnCkXmfpDDMoJDBcSwCrwGCimFEjOwY48rF59i+bwcyOqlUhnW28Sd/cY5iX5LvfOc0</div><div class='del'>-ojiOvvoUY4cn8HWLk2fPrccoYbN4uJnMDlbnWg/fvF/5oK7qzMxcpV22MCSFpx75NqlMnluO3kEi</div><div class='del'>-ZVAc6OXC5RfDL3zpS896nudtsVvd6wI63KJZ74YNsxAAsV5rlraNDLyv2fb6jVSebD5P6LucOnmc</div><div class='del'>-kICe8UmWGnUagYCU3IbLOKY3xMOPnuexx+ZJZbKEYj96ejsXLy/zB398houXljl89AN85ZtXyOz6</div><div class='del'>-GH/16ElaJLnzPR/jxKV5Ts1O8wu/+nM89uxX+cM/+MvjjuNtAlqOSW0dsBzTL+2ZGBrLJo3t46Oj</div><div class='del'>-/MtP/waH9x0ioyX5wHs/yJH77+OmWw7iR63gt/7v33p2ba1U6soIbkak7a5kudVZHq8xwe97AhcQ</div><div class='del'>-7WZtdmFp7Uci0eDQzUdJJjXOnX6BZr3Ezh376evvwwkEVGOAnoGDVBsyc8tVlFSa+YpAxcriacM8</div><div class='del'>-/NRL1IOIpbpCqv8QFxY8Pv7T/4zJg0fIDRX59L/+HZxI5Zf+xf/Czbfu5//8zU8tnjs1fb5z4ZUu</div><div class='del'>-YDcLiEGt2jw3ur3n3vnSQqZcLXPo1tsYHZ1gYHSc2dIKU7MXmr/zu//6WxcuXlqP9YZ5sfb8dhe4</div><div class='del'>-ccMZvFYd7XsBF0As1RrLupFMOZF8649/4ifQNYWB3hTZhMal46fpzaSwLZN602T37gMEvs1qeQrT</div><div class='del'>-r2H0HyI9uB8lP8rzl+aoehq21IOUHmOhYmE5Hk898whf/8Z/5R/99D/iQx/8GOPDowiByz//5V89</div><div class='del'>-4dh+qQNmGSh1AG7EdtqErbZtVertJws7C6NT64tDJ86elsZ27eWRbz+++LWHv3Ly9373t59aWFhs</div><div class='del'>-bzGwonvvQ7urOOl09YrdsDEsxDepAMl3vffBf3v02O0f37PrIBMjEyQVlSf/6vM89/wTzC1fo394</div><div class='del'>-iJtuOsyttxykUb1Gs1XiqZNLZHI9vO3Ou5idm6O/fwRdz/Cnf/YF1lYrSHKSj/7Q+/ixT/wojz3+</div><div class='del'>-GKlUFs9zOPfS87O/8r/979/qALsCLAHLHZBrsQ0gmxvEc0AWKHRWhv9/OLLGK4cTb4Jsxri8Aqx3</div><div class='del'>-nusdDWl3AXxDBwi94sZcnbrybSFqppqmf6R/9BByapRDRw+TKQ7RckCUda5eneKl8+dYXF5naaXO</div><div class='del'>-xWtXKNcrVGtV1lYrvHTuMn/zjcepV1scvulmPv7jP8X9DzyA5wv8p8/+vyhaxInnv934/d//T0/Y</div><div class='del'>-trPJtaXOhdc6F76Za91s3OjOAyi8eqZj3DtwY/vLWrEOm3asAmx31dCiG+3nhl2NwdZ3vvP8b1yd</div><div class='del'>-XT3p+vzKz/wPvzTcPzrMA4MfZMfeI0hCxNSlC6wszTM7PY1pNikUDSRZBrmPMAwYnxxg3+EMR48c</div><div class='del'>-ww8Cas0mjdY6mi7xxJOPUCpPt77zxFNP1WvNeqzMXY31E1hd/bNC1wyJ7n1mm4ZLie2aDGPGrBkD</div><div class='del'>-047tlvS7poJwo2mhe/iF2plfk5Zkqf/DH//hH3773Q99aHRsYlQWZXbt2M7c3DKpRIpsOkvCkJmb</div><div class='del'>-m+f4c8e58223s7q2wvbt47iuQ6tV42tff5jdu0ZIJFQe+cZXOH78mdWZ6cVnXNevd8BcBxY6dLDW</div><div class='del'>-AbodA2BTopTOlJMUr5w2neyszanTcXC9rtx1I/b9zS7teEs4t9tz2JxHbnROPgf0jO/cddvR2972</div><div class='del'>-jg995CMHp67M9OQyvTzwzgcQibh0YZmTL77IsWOHcT2L8W3DPPrNh/E8myuXL2C3lzh96mS93XIu</div><div class='del'>-Li6sz8bcolIH1CVgtcOF7S7Jjbo2jCdiPJvqGnYUnyG2KdF2F++2YiUet+s4bxm43QBvGpFkx4jk</div><div class='del'>-Nw2JkUqM79i1a/Ke++4fq1Rq/Yvz1cz2iQlNkhDmFmbYsWNMOHfudNho1Jori8vVVr22ZLadRkyK</div><div class='del'>-zI4ErXXAXekYsVbMuvtdjr4Qm9VjdE2I0mNTmOLjvePca8ZK6VaMb1+XGm7k7zMIW0wb2VTHTAzo</div><div class='del'>-bOd9OiY5Wkw1pa52eTcGbKMD5lqHFqodqYobmPgkD6HLs1FjgOpdE0HELbrIvRjXOl0jAAJeZ/bu</div><div class='del'>-jfwpg6grqRHGJGBTnesdUDddoVTXfDEldk7d4LZiBqzaed3qUtHu5EoYA8zvcrU225HiowaFrr9x</div><div class='del'>-Y3/nbjVT4Q27U2+RFMfHA2oxMBNd6hmX3nhhNC65ce6Lb8XfasZM9Bpz0iReOetR6RoBQNeGPm+L</div><div class='del'>-jdOvOzH6rf7ZFoGtJ4eqsaXxykFwUpe7F1fPuGpuNVvmtX4hStjipktbVHTjm6fDrr29b2oa9ff7</div><div class='del'>-h4deawKoGDMqxNQ5Dp7XtYl5qxHZr6eu3Tv1hS12p0dcf3D8Gx7z/YP4PbQ3MnBzqyz/VkPio+/m</div><div class='del'>-otl6hm53Nfd63x29mQv9QT+26mh5o/0U0RZtV2/2Jl+3w/M6x+LvErhvBOw30st2I7Tphn7v3/af</div><div class='del'>-SewGOrpeVeRv4+P/A9Q+PxXM9RiwAAAAAElFTkSuQmCC</div><div class='del'>-</div><div class='del'>-------- =_aaaaaaaaaa0--</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 f14aa4a6da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-SUBDIRS =					\</div><div class='del'>-	Calendar				\</div><div class='del'>-	Contacts				\</div><div class='del'>-	Directories				\</div><div class='del'>-	Drafts					\</div><div class='del'>-	Inbox					\</div><div class='del'>-	Outbox					\</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 d9ccc4dba4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Outbox/Makefile.am?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/local/Outbox/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Outbox</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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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/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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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 6f1acf7a4a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Trash/folder-metadata.xml?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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;mail&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/shortcuts.xml b/default_user/shortcuts.xml<br/>deleted file mode 100644<br/>index 3838b14164..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/shortcuts.xml?h=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>default_user/shortcuts.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;shortcuts&gt;</div><div class='del'>-	&lt;group title="Evolution shortcuts"&gt;</div><div class='del'>-		&lt;item&gt;evolution:/local/Inbox&lt;/item&gt;</div><div class='del'>-&lt;!--		&lt;item&gt;evolution:/local/Outbox&lt;/item&gt;</div><div class='del'>-		&lt;item&gt;evolution:/local/Trash&lt;/item&gt;</div><div class='del'>-		&lt;item&gt;evolution:/local/Drafts&lt;/item&gt; --&gt;</div><div class='del'>-		&lt;item&gt;evolution:/local/Calendar&lt;/item&gt;</div><div class='del'>-		&lt;item&gt;evolution:/local/Contacts&lt;/item&gt;</div><div class='del'>-	&lt;/group&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	&lt;group title="Internet Directories"&gt;</div><div class='del'>-	 &lt;item&gt;evolution:/local/Directories/Bigfoot&lt;/item&gt;</div><div class='del'>-	 &lt;item&gt;evolution:/local/Directories/Netcenter&lt;/item&gt;</div><div class='del'>-	&lt;/group&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--	&lt;group title="Personal shortcuts"&gt;</div><div class='del'>-	&lt;/group&gt;</div><div class='del'>---&gt;</div><div class='del'>-&lt;/shortcuts&gt;</div><div class='del'>-</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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>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=WITH_LIBEFS&amp;id=5d0f34b4eefc1f57757e23e4583394742dca1dc8'>devel-docs/camel/tmpl/camel-folder.sgml</a><br/>+++ /dev/null</div>